diff options
| author | Jakub Senko <jakubsenko@gmail.com> | 2019-03-27 12:09:55 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-09-30 20:25:44 +0200 |
| commit | 975fe1e153c35d7079d06655c43303b04a6502a7 (patch) | |
| tree | bdbf4c6a239e9f751b27c4bb45a679abf94b73b7 /phpBB | |
| parent | b6c230753ee17fe65b43929d4fc10248ea2a23bf (diff) | |
| download | forums-975fe1e153c35d7079d06655c43303b04a6502a7.tar forums-975fe1e153c35d7079d06655c43303b04a6502a7.tar.gz forums-975fe1e153c35d7079d06655c43303b04a6502a7.tar.bz2 forums-975fe1e153c35d7079d06655c43303b04a6502a7.tar.xz forums-975fe1e153c35d7079d06655c43303b04a6502a7.zip | |
[ticket/15257] Provide extension not enableable messages
PHPBB3-15257
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/acp/acp_extensions.php | 22 | ||||
| -rw-r--r-- | phpBB/phpbb/console/command/extension/enable.php | 5 | ||||
| -rw-r--r-- | phpBB/phpbb/extension/extension_interface.php | 3 |
3 files changed, 20 insertions, 10 deletions
diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php index 2929de3c4f..da03b576bf 100644 --- a/phpBB/includes/acp/acp_extensions.php +++ b/phpBB/includes/acp/acp_extensions.php @@ -172,10 +172,8 @@ class acp_extensions } $extension = $this->ext_manager->get_extension($ext_name); - if (!$extension->is_enableable()) - { - trigger_error($this->user->lang['EXTENSION_NOT_ENABLEABLE'] . adm_back_link($this->u_action), E_USER_WARNING); - } + + $this->check_is_enableable($extension->is_enableable()); if ($this->ext_manager->is_enabled($ext_name)) { @@ -209,10 +207,8 @@ class acp_extensions } $extension = $this->ext_manager->get_extension($ext_name); - if (!$extension->is_enableable()) - { - trigger_error($this->user->lang['EXTENSION_NOT_ENABLEABLE'] . adm_back_link($this->u_action), E_USER_WARNING); - } + + $this->check_is_enableable($extension->is_enableable()); try { @@ -727,4 +723,14 @@ class acp_extensions )); } } + + protected function check_is_enableable($enableable) + { + if ($enableable !== true) + { + $message = !empty($enableable) ? $enableable : $this->user->lang('EXTENSION_NOT_ENABLEABLE'); + $message = is_array($message) ? implode('<br />', $message) : $message; + trigger_error($message . adm_back_link($this->u_action), E_USER_WARNING); + } + } } diff --git a/phpBB/phpbb/console/command/extension/enable.php b/phpBB/phpbb/console/command/extension/enable.php index a6f5b10e86..f007009aa0 100644 --- a/phpBB/phpbb/console/command/extension/enable.php +++ b/phpBB/phpbb/console/command/extension/enable.php @@ -69,7 +69,10 @@ class enable extends command } else { - $io->error($this->user->lang('CLI_EXTENSION_ENABLE_FAILURE', $name)); + $enableable = $this->manager->get_extension($name)->is_enableable(); + $message = !empty($enableable) ? $enableable : $this->user->lang('CLI_EXTENSION_ENABLE_FAILURE'); + $message = is_array($message) ? implode(PHP_EOL, $message) : $message; + $io->error($message, $name); return 1; } } diff --git a/phpBB/phpbb/extension/extension_interface.php b/phpBB/phpbb/extension/extension_interface.php index 6a6b6adb8f..46072d420c 100644 --- a/phpBB/phpbb/extension/extension_interface.php +++ b/phpBB/phpbb/extension/extension_interface.php @@ -22,7 +22,8 @@ interface extension_interface /** * Indicate whether or not the extension can be enabled. * - * @return bool + * @return bool|array True if extension is enableable, array of reasons + * if not, false for generic reason. */ public function is_enableable(); |