From e6bdecbfee4b38dfdaafe723c672c86970bdae4a Mon Sep 17 00:00:00 2001 From: rxu Date: Sun, 30 Jun 2024 19:07:41 +0700 Subject: [PATCH] [ticket/17359] Distinct disabled and available extensions list PHPBB-17359 --- phpBB/adm/style/acp_ext_list.html | 28 +++++++++++++++++++++++++++ phpBB/includes/acp/acp_extensions.php | 6 +++--- phpBB/language/en/acp/extensions.php | 1 + 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html index 9e019fa1c2..0cfd21dc7e 100644 --- a/phpBB/adm/style/acp_ext_list.html +++ b/phpBB/adm/style/acp_ext_list.html @@ -95,6 +95,34 @@ + + + + {L_EXTENSIONS_AVAILABLE} + + + + {available.META_DISPLAY_NAME} + + + {available.META_VERSION} + + + {available.META_VERSION} + + + + {L_DETAILS} + + + + title="{available.actions.L_ACTION_EXPLAIN}">{available.actions.L_ACTION} +  |  + + + + + diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php index 17281a111a..f481f764d1 100644 --- a/phpBB/includes/acp/acp_extensions.php +++ b/phpBB/includes/acp/acp_extensions.php @@ -575,7 +575,7 @@ class acp_extensions catch (exception_interface $e) { $message = call_user_func_array(array($this->user, 'lang'), array_merge(array($e->getMessage()), $e->get_parameters())); - $this->template->assign_block_vars('disabled', array( + $this->template->assign_block_vars('available', array( 'META_DISPLAY_NAME' => $this->user->lang('EXTENSION_INVALID_LIST', $name, $message), 'S_VERSIONCHECK' => false, )); @@ -589,9 +589,9 @@ class acp_extensions $block_vars['NAME'] = $name; $block_vars['U_DETAILS'] = $this->u_action . '&action=details&ext_name=' . urlencode($name); - $this->template->assign_block_vars('disabled', $block_vars); + $this->template->assign_block_vars('available', $block_vars); - $this->output_actions('disabled', array( + $this->output_actions('available', array( 'ENABLE' => $this->u_action . '&action=enable_pre&ext_name=' . urlencode($name), )); } diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php index a96a7a2a2b..16668b5161 100644 --- a/phpBB/language/en/acp/extensions.php +++ b/phpBB/language/en/acp/extensions.php @@ -47,6 +47,7 @@ $lang = array_merge($lang, array( 'DETAILS' => 'Details', + 'EXTENSIONS_AVAILABLE' => 'Available Extensions', 'EXTENSIONS_DISABLED' => 'Disabled Extensions', 'EXTENSIONS_ENABLED' => 'Enabled Extensions',