mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.3.x'

Browse Source
This commit is contained in:
Marc Alexander
2019-10-28 17:17:19 +01:00
parent 6a5ae59ebf 0e8e8c7b14
commit 9f293bfbc1
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
phpBB/phpbb/console/command/extension/enable.php
View File

@@ -46,9 +46,11 @@ class enable extends command
$extension = $this->manager->get_extension($name);
if (!$extension->is_enableable())
if (($enableable = $extension->is_enableable()) !== true)
{
$io->error($this->user->lang('CLI_EXTENSION_NOT_ENABLEABLE', $name));
$message = !empty($enableable) ? $enableable : $this->user->lang('CLI_EXTENSION_NOT_ENABLEABLE', $name);
$message = is_array($message) ? implode(PHP_EOL, $message) : $message;
$io->error($message);
return 1;
}
@@ -69,10 +71,7 @@ class enable extends command
}
else
{
$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);
$io->error($this->user->lang('CLI_EXTENSION_ENABLE_FAILURE', $name));
return 1;
}
}