diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-08-07 13:00:21 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-08-07 13:00:21 +0200 |
| commit | 3722aac495014f190d2c8f14d7b3ee0b1b712186 (patch) | |
| tree | 86fa40fccf11c7b9b6126187b6dcf2f98c0f4058 /phpBB/includes | |
| parent | 28224bad70fe5c2d912d96f2f35e4e5d99301c71 (diff) | |
| parent | f474e33a430176fd7ef809141b258eec77993e03 (diff) | |
| download | forums-3722aac495014f190d2c8f14d7b3ee0b1b712186.tar forums-3722aac495014f190d2c8f14d7b3ee0b1b712186.tar.gz forums-3722aac495014f190d2c8f14d7b3ee0b1b712186.tar.bz2 forums-3722aac495014f190d2c8f14d7b3ee0b1b712186.tar.xz forums-3722aac495014f190d2c8f14d7b3ee0b1b712186.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12847] Allow the extensions to say if they can be enabled
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_extensions.php | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php index aba9caaece..9bdd8eb458 100644 --- a/phpBB/includes/acp/acp_extensions.php +++ b/phpBB/includes/acp/acp_extensions.php @@ -137,6 +137,12 @@ class acp_extensions trigger_error($user->lang['EXTENSION_NOT_AVAILABLE'] . adm_back_link($this->u_action), E_USER_WARNING); } + $extension = $phpbb_extension_manager->get_extension($ext_name); + if (!$extension->is_enableable()) + { + trigger_error($user->lang['EXTENSION_NOT_ENABLEABLE'] . adm_back_link($this->u_action), E_USER_WARNING); + } + if ($phpbb_extension_manager->is_enabled($ext_name)) { redirect($this->u_action); @@ -162,6 +168,12 @@ class acp_extensions trigger_error($user->lang['EXTENSION_NOT_AVAILABLE'] . adm_back_link($this->u_action), E_USER_WARNING); } + $extension = $phpbb_extension_manager->get_extension($ext_name); + if (!$extension->is_enableable()) + { + trigger_error($user->lang['EXTENSION_NOT_ENABLEABLE'] . adm_back_link($this->u_action), E_USER_WARNING); + } + if ($phpbb_extension_manager->is_enabled($ext_name)) { redirect($this->u_action); |