diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-02-14 23:32:17 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-02-14 23:41:53 +0100 |
| commit | 27cfda74fc5085bba8d5baf36450b3f52187dce9 (patch) | |
| tree | dcf559dab641cd5dc901da21efd658d9ea5cd529 | |
| parent | 8314ce6871c3e6f28c5bc374d1b73afc85f58b85 (diff) | |
| download | forums-27cfda74fc5085bba8d5baf36450b3f52187dce9.tar forums-27cfda74fc5085bba8d5baf36450b3f52187dce9.tar.gz forums-27cfda74fc5085bba8d5baf36450b3f52187dce9.tar.bz2 forums-27cfda74fc5085bba8d5baf36450b3f52187dce9.tar.xz forums-27cfda74fc5085bba8d5baf36450b3f52187dce9.zip | |
[ticket/13612] Always display success message if extension was enabled
An error will already be triggered if enable_step() is not successful.
Redirecting for no obvious reason will just confuse users.
PHPBB3-13612
| -rw-r--r-- | phpBB/includes/acp/acp_extensions.php | 5 | ||||
| -rw-r--r-- | tests/test_framework/phpbb_functional_test_case.php | 9 |
2 files changed, 1 insertions, 13 deletions
diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php index 89fdc8b863..0c9bc0deab 100644 --- a/phpBB/includes/acp/acp_extensions.php +++ b/phpBB/includes/acp/acp_extensions.php @@ -174,11 +174,6 @@ class acp_extensions 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); - } - try { while ($phpbb_extension_manager->enable_step($ext_name)) diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index 7479221263..844caa8f54 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -422,14 +422,7 @@ class phpbb_functional_test_case extends phpbb_test_case $meta_refresh = $crawler->filter('meta[http-equiv="refresh"]'); } - if (!empty($meta_refresh)) - { - $this->assertContainsLang('EXTENSIONS_ADMIN', $crawler->filter('.main > h1')->text()); - } - else - { - $this->assertContainsLang('EXTENSION_ENABLE_SUCCESS', $crawler->filter('div.successbox')->text()); - } + $this->assertContainsLang('EXTENSION_ENABLE_SUCCESS', $crawler->filter('div.successbox')->text()); $this->logout(); } |