makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/15011] Use exception interface for 3.2

Browse source 
Update the mentioned ticket to 3.2 by using exception_inteface
instead of the actual exception class.
Also, use adm_back_link consistently.

PHPBB3-15011
This commit is contained in:
javiexin 2017-04-21 21:28:29 +02:00
parent ad5fcd5356
commit 6a61e73e00
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/includes/acp/acp_extensions.php
View file

@ -106,7 +106,7 @@ class acp_extensions
catch (exception_interface $e) catch (exception_interface $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);
} }
} }
@ -161,7 +161,7 @@ class acp_extensions
{ {
$md_manager->validate_enable(); $md_manager->validate_enable();
} }
catch (\phpbb\extension\exception $e) catch (exception_interface $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 . adm_back_link($this->u_action), E_USER_WARNING); trigger_error($message . adm_back_link($this->u_action), E_USER_WARNING);
@ -192,7 +192,7 @@ class acp_extensions
{ {
$md_manager->validate_enable(); $md_manager->validate_enable();
} }
catch (\phpbb\extension\exception $e) catch (exception_interface $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 . adm_back_link($this->u_action), E_USER_WARNING); trigger_error($message . adm_back_link($this->u_action), E_USER_WARNING);