diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-05-02 13:21:21 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-05-02 13:21:21 +0200 |
| commit | 2f480be02d25421fa4c372c103604f24d4adf0ab (patch) | |
| tree | 2f4a353b340a7dd60ed63bdf6177aeeb426fc0c9 /phpBB/includes/acp/acp_extensions.php | |
| parent | e51571eaa3b52a5a344cc847b51049c67642f6ff (diff) | |
| parent | 57072a1e28061ff51148c7d6a0c47664f0060639 (diff) | |
| download | forums-2f480be02d25421fa4c372c103604f24d4adf0ab.tar forums-2f480be02d25421fa4c372c103604f24d4adf0ab.tar.gz forums-2f480be02d25421fa4c372c103604f24d4adf0ab.tar.bz2 forums-2f480be02d25421fa4c372c103604f24d4adf0ab.tar.xz forums-2f480be02d25421fa4c372c103604f24d4adf0ab.zip | |
Merge pull request #3565 from MateBartus/ticket/13793
[ticket/13793] Remove translation on throwing exceptions
Diffstat (limited to 'phpBB/includes/acp/acp_extensions.php')
| -rw-r--r-- | phpBB/includes/acp/acp_extensions.php | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php index 0c9bc0deab..cbef13dfd0 100644 --- a/phpBB/includes/acp/acp_extensions.php +++ b/phpBB/includes/acp/acp_extensions.php @@ -70,7 +70,7 @@ class acp_extensions // If they've specified an extension, let's load the metadata manager and validate it. if ($ext_name) { - $md_manager = new \phpbb\extension\metadata_manager($ext_name, $config, $phpbb_extension_manager, $template, $user, $phpbb_root_path); + $md_manager = new \phpbb\extension\metadata_manager($ext_name, $config, $phpbb_extension_manager, $template, $phpbb_root_path); try { @@ -78,7 +78,8 @@ class acp_extensions } catch(\phpbb\extension\exception $e) { - trigger_error($e, E_USER_WARNING); + $message = call_user_func_array(array($this->user, 'lang'), array_merge(array($e->getMessage()), $e->get_parameters())); + trigger_error($message, E_USER_WARNING); } } @@ -354,8 +355,9 @@ class acp_extensions } catch(\phpbb\extension\exception $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( - 'META_DISPLAY_NAME' => $this->user->lang('EXTENSION_INVALID_LIST', $name, $e), + 'META_DISPLAY_NAME' => $this->user->lang('EXTENSION_INVALID_LIST', $name, $message), 'S_VERSIONCHECK' => false, )); } @@ -410,8 +412,9 @@ class acp_extensions } catch(\phpbb\extension\exception $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( - 'META_DISPLAY_NAME' => $this->user->lang('EXTENSION_INVALID_LIST', $name, $e), + 'META_DISPLAY_NAME' => $this->user->lang('EXTENSION_INVALID_LIST', $name, $message), 'S_VERSIONCHECK' => false, )); } @@ -469,8 +472,9 @@ class acp_extensions } catch(\phpbb\extension\exception $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( - 'META_DISPLAY_NAME' => $this->user->lang('EXTENSION_INVALID_LIST', $name, $e), + 'META_DISPLAY_NAME' => $this->user->lang('EXTENSION_INVALID_LIST', $name, $message), 'S_VERSIONCHECK' => false, )); } |