diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2017-04-21 23:51:41 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2017-04-21 23:51:41 +0200 |
| commit | f40d4e03a30b8a29b3114f435017d1a6be824763 (patch) | |
| tree | 14e1b94b9ae1354c5b61777f882513f69b203530 | |
| parent | ad5fcd535630b9a93333bb6e16bc84bff8f103ae (diff) | |
| parent | 6a61e73e00bdd52e6e96fca07e024059ceadc579 (diff) | |
| download | forums-f40d4e03a30b8a29b3114f435017d1a6be824763.tar forums-f40d4e03a30b8a29b3114f435017d1a6be824763.tar.gz forums-f40d4e03a30b8a29b3114f435017d1a6be824763.tar.bz2 forums-f40d4e03a30b8a29b3114f435017d1a6be824763.tar.xz forums-f40d4e03a30b8a29b3114f435017d1a6be824763.zip | |
Merge pull request #4806 from javiexin/ticket/15011v32
[ticket/15011] Use exception interface for 3.2
* github.com:phpbb/phpbb:
[ticket/15011] Use exception interface for 3.2
| -rw-r--r-- | phpBB/includes/acp/acp_extensions.php | 6 |
1 files changed, 3 insertions, 3 deletions
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); |