From e854e5b71f90910075fbac2b4f0dadac4fd39588 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= Date: Sun, 3 Sep 2017 17:50:40 +0200 Subject: [ticket/15346] Check if extension is enableable during install PHPBB3-15346 --- .../install/module/install_finish/task/install_extensions.php | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'phpBB/phpbb') 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..db28ad8fe3 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,13 @@ class install_extensions extends \phpbb\install\task_base try { + $extension = $this->extension_manager->get_extension($ext_name); + + if (!$extension->is_enableable()) + { + continue; + } + $this->extension_manager->enable($ext_name); $extensions = $this->get_extensions(); -- cgit v1.2.1 From d99dbf1f0ea08e69be4fd61df2a45bbf1f0b1340 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= Date: Tue, 5 Sep 2017 17:50:44 +0200 Subject: [ticket/15346] Add log message if extension is not enableable PHPBB3-15346 --- phpBB/phpbb/install/module/install_finish/task/install_extensions.php | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/phpbb') 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 db28ad8fe3..eee13a6581 100644 --- a/phpBB/phpbb/install/module/install_finish/task/install_extensions.php +++ b/phpBB/phpbb/install/module/install_finish/task/install_extensions.php @@ -122,6 +122,7 @@ class install_extensions extends \phpbb\install\task_base if (!$extension->is_enableable()) { + $this->iohandler->add_log_message(array('CLI_EXTENSION_NOT_ENABLEABLE', $ext_name)); continue; } -- cgit v1.2.1