From f3a2c99a14fd9bf017a84377559a2ad4239c9e63 Mon Sep 17 00:00:00 2001 From: rubencm Date: Sat, 15 Sep 2018 09:13:01 +0000 Subject: [PATCH 1/2] [ticket/15772] Hide warning in acp when allow_install_dir is true PHPBB3-15772 --- phpBB/includes/acp/acp_main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php index 4ab2c409ab..ca3b885e11 100644 --- a/phpBB/includes/acp/acp_main.php +++ b/phpBB/includes/acp/acp_main.php @@ -639,7 +639,7 @@ class acp_main } // Warn if install is still present - if (file_exists($phpbb_root_path . 'install') && !is_file($phpbb_root_path . 'install')) + if (!defined('IN_INSTALL') && !$phpbb_container->getParameter('allow_install_dir') && file_exists($phpbb_root_path . 'install') && !is_file($phpbb_root_path . 'install')) { $template->assign_var('S_REMOVE_INSTALL', true); } From 1fd304b56450225d9741ce6392a53ac41f2c7add Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 22 Sep 2018 11:59:32 +0200 Subject: [PATCH 2/2] [ticket/15772] Make sure to not run install extensions in ui test case PHPBB3-15772 --- tests/test_framework/phpbb_ui_test_case.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/test_framework/phpbb_ui_test_case.php b/tests/test_framework/phpbb_ui_test_case.php index a64e89d3b9..c17be6453b 100644 --- a/tests/test_framework/phpbb_ui_test_case.php +++ b/tests/test_framework/phpbb_ui_test_case.php @@ -210,6 +210,8 @@ class phpbb_ui_test_case extends phpbb_test_case $container->register('installer.install_finish.notify_user')->setSynthetic(true); $container->set('installer.install_finish.notify_user', new phpbb_mock_null_installer_task()); + $container->register('installer.install_finish.install_extensions')->setSynthetic(true); + $container->set('installer.install_finish.install_extensions', new phpbb_mock_null_installer_task()); $container->compile(); $language = $container->get('language');