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

Merge branch '3.2.x'

Browse source
This commit is contained in:
Máté Bartus 2017-09-07 14:13:58 +02:00
commit 60dba82e1d
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/language/en/cli.php
View file

@ -123,6 +123,7 @@ $lang = array_merge($lang, array(
'CLI_EXTENSION_UPDATE_FAILURE' => 'Could not update extension %s', 'CLI_EXTENSION_UPDATE_FAILURE' => 'Could not update extension %s',
'CLI_EXTENSION_UPDATE_SUCCESS' => 'Successfully updated extension %s', 'CLI_EXTENSION_UPDATE_SUCCESS' => 'Successfully updated extension %s',
'CLI_EXTENSION_NOT_FOUND' => 'No extensions were found.', 'CLI_EXTENSION_NOT_FOUND' => 'No extensions were found.',
'CLI_EXTENSION_NOT_ENABLEABLE' => 'Extension %s is not enableable.',
'CLI_EXTENSIONS_AVAILABLE' => 'Available', 'CLI_EXTENSIONS_AVAILABLE' => 'Available',
'CLI_EXTENSIONS_DISABLED' => 'Disabled', 'CLI_EXTENSIONS_DISABLED' => 'Disabled',
'CLI_EXTENSIONS_ENABLED' => 'Enabled', 'CLI_EXTENSIONS_ENABLED' => 'Enabled',

8
phpBB/phpbb/install/module/install_finish/task/install_extensions.php
View file

@ -118,6 +118,14 @@ class install_extensions extends \phpbb\install\task_base
try try
{ {
$extension = $this->extension_manager->get_extension($ext_name);
if (!$extension->is_enableable())
{
$this->iohandler->add_log_message(array('CLI_EXTENSION_NOT_ENABLEABLE', $ext_name));
continue;
}
$this->extension_manager->enable($ext_name); $this->extension_manager->enable($ext_name);
$extensions = $this->get_extensions(); $extensions = $this->get_extensions();