diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-03-23 21:52:35 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-03-23 21:52:35 +0100 |
| commit | a975a3573435d56b837c78b9df5ef92dc2b6dba6 (patch) | |
| tree | 4644689e9918228051700822b2782047acc3aade /phpBB | |
| parent | 6f1de69bbe8c876ce3c69f7f23d3dcdf65a890b2 (diff) | |
| download | forums-a975a3573435d56b837c78b9df5ef92dc2b6dba6.tar forums-a975a3573435d56b837c78b9df5ef92dc2b6dba6.tar.gz forums-a975a3573435d56b837c78b9df5ef92dc2b6dba6.tar.bz2 forums-a975a3573435d56b837c78b9df5ef92dc2b6dba6.tar.xz forums-a975a3573435d56b837c78b9df5ef92dc2b6dba6.zip | |
[ticket/15135] Correctly pass exception arguments and add back link again
PHPBB3-15135
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/acp/acp_extensions.php | 5 | ||||
| -rw-r--r-- | phpBB/phpbb/extension/metadata_manager.php | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php index c38c492c1f..164e5872bb 100644 --- a/phpBB/includes/acp/acp_extensions.php +++ b/phpBB/includes/acp/acp_extensions.php @@ -163,7 +163,7 @@ 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())); - trigger_error($message, E_USER_WARNING); + trigger_error($message . adm_back_link($this->u_action), E_USER_WARNING); } $extension = $phpbb_extension_manager->get_extension($ext_name); @@ -193,7 +193,8 @@ class acp_extensions } catch (\phpbb\extension\exception $e) { - trigger_error($e . adm_back_link($this->u_action), E_USER_WARNING); + $message = call_user_func_array(array($this->user, 'lang'), array_merge(array($e->getMessage()), $e->get_parameters())); + trigger_error($message . adm_back_link($this->u_action), E_USER_WARNING); } $extension = $phpbb_extension_manager->get_extension($ext_name); diff --git a/phpBB/phpbb/extension/metadata_manager.php b/phpBB/phpbb/extension/metadata_manager.php index 3dc6cdaee6..6fc6dc9891 100644 --- a/phpBB/phpbb/extension/metadata_manager.php +++ b/phpBB/phpbb/extension/metadata_manager.php @@ -295,7 +295,7 @@ class metadata_manager { if (!isset($this->metadata['extra']['soft-require']['phpbb/phpbb'])) { - throw new \phpbb\extension\exception('META_FIELD_NOT_SET', 'soft-require'); + throw new \phpbb\extension\exception('META_FIELD_NOT_SET', array('soft-require')); } return true; @@ -311,7 +311,7 @@ class metadata_manager { if (!isset($this->metadata['require']['php'])) { - throw new \phpbb\extension\exception('META_FIELD_NOT_SET', 'require php'); + throw new \phpbb\extension\exception('META_FIELD_NOT_SET', array('require php')); } return true; |