diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-05-11 21:39:13 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-05-28 22:16:55 +0200 |
| commit | 492c1952c1059772d75c04cf6a1c589ff37768e9 (patch) | |
| tree | fd12c03f809b0dc6468e74b7a330b802397c1020 | |
| parent | 9173e7d7fd062cd2c0aed12c119e253cfec107f4 (diff) | |
| download | forums-492c1952c1059772d75c04cf6a1c589ff37768e9.tar forums-492c1952c1059772d75c04cf6a1c589ff37768e9.tar.gz forums-492c1952c1059772d75c04cf6a1c589ff37768e9.tar.bz2 forums-492c1952c1059772d75c04cf6a1c589ff37768e9.tar.xz forums-492c1952c1059772d75c04cf6a1c589ff37768e9.zip | |
[ticket/11366] Update var names
PHPBB3-11366
| -rw-r--r-- | phpBB/includes/acp/acp_extensions.php | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php index 2c06050e5c..3ae33c6284 100644 --- a/phpBB/includes/acp/acp_extensions.php +++ b/phpBB/includes/acp/acp_extensions.php @@ -309,7 +309,7 @@ class acp_extensions $enabled_extension_meta_data[$name]['S_UP_TO_DATE'] = empty($updates); $enabled_extension_meta_data[$name]['S_VERSIONCHECK'] = true; $enabled_extension_meta_data[$name]['U_VERSIONCHECK_FORCE'] = $this->u_action . '&action=details&versioncheck_force=1&ext_name=' . urlencode($md_manager->get_metadata('name')); - } + } catch(\phpbb\extension\exception $e) { $this->template->assign_block_vars('disabled', array( @@ -325,12 +325,11 @@ class acp_extensions uasort($enabled_extension_meta_data, array($this, 'sort_extension_meta_data_table')); - foreach ($enabled_extension_meta_data as $name => $infos) + foreach ($enabled_extension_meta_data as $name => $block_vars) { - $values = $infos; - $values['U_DETAILS'] = $this->u_action . '&action=details&ext_name=' . urlencode($name); - - $this->template->assign_block_vars('enabled', $values); + $block_vars['U_DETAILS'] = $this->u_action . '&action=details&ext_name=' . urlencode($name); + + $this->template->assign_block_vars('enabled', $block_vars); $this->output_actions('enabled', array( 'DISABLE' => $this->u_action . '&action=disable_pre&ext_name=' . urlencode($name), @@ -381,12 +380,11 @@ class acp_extensions uasort($disabled_extension_meta_data, array($this, 'sort_extension_meta_data_table')); - foreach ($disabled_extension_meta_data as $name => $infos) + foreach ($disabled_extension_meta_data as $name => $block_vars) { - $values = $infos; - $values['U_DETAILS'] = $this->u_action . '&action=details&ext_name=' . urlencode($name); - - $this->template->assign_block_vars('disabled', $values); + $block_vars['U_DETAILS'] = $this->u_action . '&action=details&ext_name=' . urlencode($name); + + $this->template->assign_block_vars('disabled', $block_vars); $this->output_actions('disabled', array( 'ENABLE' => $this->u_action . '&action=enable_pre&ext_name=' . urlencode($name), @@ -440,12 +438,11 @@ class acp_extensions uasort($available_extension_meta_data, array($this, 'sort_extension_meta_data_table')); - foreach ($available_extension_meta_data as $name => $infos) + foreach ($available_extension_meta_data as $name => $block_vars) { - $values = $infos; - $values['U_DETAILS'] = $this->u_action . '&action=details&ext_name=' . urlencode($name); - - $this->template->assign_block_vars('disabled', $values); + $block_vars['U_DETAILS'] = $this->u_action . '&action=details&ext_name=' . urlencode($name); + + $this->template->assign_block_vars('disabled', $block_vars); $this->output_actions('disabled', array( 'ENABLE' => $this->u_action . '&action=enable_pre&ext_name=' . urlencode($name), |