From 6a61e73e00bdd52e6e96fca07e024059ceadc579 Mon Sep 17 00:00:00 2001 From: javiexin Date: Fri, 21 Apr 2017 21:28:29 +0200 Subject: [ticket/15011] Use exception interface for 3.2 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 --- phpBB/includes/acp/acp_extensions.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'phpBB/includes/acp/acp_extensions.php') diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php index 5c589222c6..c08674841c 100644 --- a/phpBB/includes/acp/acp_extensions.php +++ b/phpBB/includes/acp/acp_extensions.php @@ -106,7 +106,7 @@ class acp_extensions catch (exception_interface $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); } } @@ -161,7 +161,7 @@ class acp_extensions { $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())); trigger_error($message . adm_back_link($this->u_action), E_USER_WARNING); @@ -192,7 +192,7 @@ class acp_extensions { $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())); trigger_error($message . adm_back_link($this->u_action), E_USER_WARNING); -- cgit v1.2.1