diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-03-19 15:49:33 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-03-19 15:49:33 +0100 |
| commit | 59396771e6fe99a42aa48f0b8192c9c90bf60f6b (patch) | |
| tree | d30379f27d186836d4f20b33c2a708c3a541eccc /phpBB/includes | |
| parent | 0f95e607ff91277a50bd5ff04d8a60a553dd918e (diff) | |
| parent | 7f69580df3b6125941fc39d63f8498488f32231a (diff) | |
| download | forums-59396771e6fe99a42aa48f0b8192c9c90bf60f6b.tar forums-59396771e6fe99a42aa48f0b8192c9c90bf60f6b.tar.gz forums-59396771e6fe99a42aa48f0b8192c9c90bf60f6b.tar.bz2 forums-59396771e6fe99a42aa48f0b8192c9c90bf60f6b.tar.xz forums-59396771e6fe99a42aa48f0b8192c9c90bf60f6b.zip | |
Merge pull request #4703 from javiexin/ticket/15011
[ticket/15011] All errors on metadata throw exceptions
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_extensions.php | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php index 5a2ded91e2..bc8d6263f6 100644 --- a/phpBB/includes/acp/acp_extensions.php +++ b/phpBB/includes/acp/acp_extensions.php @@ -141,14 +141,13 @@ class acp_extensions break; case 'enable_pre': - if (!$md_manager->validate_dir()) + try { - trigger_error($user->lang['EXTENSION_DIR_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING); + $md_manager->validate_enable(); } - - if (!$md_manager->validate_enable()) + catch (\phpbb\extension\exception $e) { - trigger_error($user->lang['EXTENSION_NOT_AVAILABLE'] . adm_back_link($this->u_action), E_USER_WARNING); + trigger_error($e . adm_back_link($this->u_action), E_USER_WARNING); } $extension = $phpbb_extension_manager->get_extension($ext_name); @@ -172,14 +171,13 @@ class acp_extensions break; case 'enable': - if (!$md_manager->validate_dir()) + try { - trigger_error($user->lang['EXTENSION_DIR_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING); + $md_manager->validate_enable(); } - - if (!$md_manager->validate_enable()) + catch (\phpbb\extension\exception $e) { - trigger_error($user->lang['EXTENSION_NOT_AVAILABLE'] . adm_back_link($this->u_action), E_USER_WARNING); + trigger_error($e . adm_back_link($this->u_action), E_USER_WARNING); } $extension = $phpbb_extension_manager->get_extension($ext_name); |