mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-11 01:55:24 +02:00
Code Issues Releases Wiki Activity

[ticket/15135] Correctly pass exception arguments and add back link again

Browse Source 
PHPBB3-15135
This commit is contained in:
Marc Alexander 2017-03-23 21:52:35 +01:00
parent 6f1de69bbe
commit a975a35734
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
phpBB/includes/acp/acp_extensions.php
View File

@ -163,7 +163,7 @@ class acp_extensions
catch (\phpbb\extension\exception $e) catch (\phpbb\extension\exception $e)
{ {
$message = call_user_func_array(array($this->user, 'lang'), array_merge(array($e->getMessage()), $e->get_parameters())); $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); $extension = $phpbb_extension_manager->get_extension($ext_name);
@ -193,7 +193,8 @@ class acp_extensions
} }
catch (\phpbb\extension\exception $e) 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); $extension = $phpbb_extension_manager->get_extension($ext_name);

4
phpBB/phpbb/extension/metadata_manager.php
View File

@ -295,7 +295,7 @@ class metadata_manager
{ {
if (!isset($this->metadata['extra']['soft-require']['phpbb/phpbb'])) 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; return true;
@ -311,7 +311,7 @@ class metadata_manager
{ {
if (!isset($this->metadata['require']['php'])) 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; return true;