makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 12:28:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5721 from VSEphpbb/ticket/16192

Browse source 
[ticket/16192] Fix CLI extension not enableable messages
This commit is contained in:
Marc Alexander 2019-10-28 17:17:12 +01:00
commit 0e8e8c7b14
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 5 additions and 6 deletions
Show stats 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); $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; return 1;
} }
@ -69,10 +71,7 @@ class enable extends command
} }
else else
{ {
$enableable = $this->manager->get_extension($name)->is_enableable(); $io->error($this->user->lang('CLI_EXTENSION_ENABLE_FAILURE', $name));
$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; return 1;
} }
} }