aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/install
diff options
context:
space:
mode:
authorMáté Bartus <CHItA@users.noreply.github.com>2017-09-07 14:12:18 +0200
committerGitHub <noreply@github.com>2017-09-07 14:12:18 +0200
commit384ece3621b1f6e0f97e2ce2208a990d4a03f407 (patch)
treee6e1f347e85fbc7b6d5bba5da9ad1ae10ff71926 /phpBB/phpbb/install
parent9c0bb4afb583169d42a5f5ae3cb91d6c0a9449b7 (diff)
parentd99dbf1f0ea08e69be4fd61df2a45bbf1f0b1340 (diff)
downloadforums-384ece3621b1f6e0f97e2ce2208a990d4a03f407.tar
forums-384ece3621b1f6e0f97e2ce2208a990d4a03f407.tar.gz
forums-384ece3621b1f6e0f97e2ce2208a990d4a03f407.tar.bz2
forums-384ece3621b1f6e0f97e2ce2208a990d4a03f407.tar.xz
forums-384ece3621b1f6e0f97e2ce2208a990d4a03f407.zip
Merge pull request #4924 from rubencm/ticket/15346
[ticket/15346] Check if extension is enableable during install
Diffstat (limited to 'phpBB/phpbb/install')
-rw-r--r--phpBB/phpbb/install/module/install_finish/task/install_extensions.php8
1 files changed, 8 insertions, 0 deletions
diff --git a/phpBB/phpbb/install/module/install_finish/task/install_extensions.php b/phpBB/phpbb/install/module/install_finish/task/install_extensions.php
index 553a30ea28..eee13a6581 100644
--- a/phpBB/phpbb/install/module/install_finish/task/install_extensions.php
+++ b/phpBB/phpbb/install/module/install_finish/task/install_extensions.php
@@ -118,6 +118,14 @@ class install_extensions extends \phpbb\install\task_base
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);
$extensions = $this->get_extensions();