1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-21 08:00:46 +01:00

[ticket/16192] Fix CLI extension not enableable messages

PHPBB3-16192
This commit is contained in:
Matt Friedman 2019-10-27 16:22:24 -07:00
parent b6f400a014
commit 7ae8f98ec6

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;
}
}