From 0f941a8db2d4437077b48807be2a71dd32d637ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= Date: Wed, 14 Jun 2017 06:12:02 +0200 Subject: [PATCH 1/2] [ticket/15203] Include missing constants in web installer PHPBB3-15203 --- phpBB/install/startup.php | 1 + 1 file changed, 1 insertion(+) diff --git a/phpBB/install/startup.php b/phpBB/install/startup.php index 9a4f9bfe39..50758f5b98 100644 --- a/phpBB/install/startup.php +++ b/phpBB/install/startup.php @@ -120,6 +120,7 @@ $phpbb_adm_relative_path = (isset($phpbb_adm_relative_path)) ? $phpbb_adm_relati $phpbb_admin_path = (defined('PHPBB_ADMIN_PATH')) ? PHPBB_ADMIN_PATH : $phpbb_root_path . $phpbb_adm_relative_path; // Include files +phpbb_require_updated('includes/compatibility_globals.' . $phpEx, $phpbb_root_path); phpbb_require_updated('includes/functions.' . $phpEx, $phpbb_root_path); phpbb_require_updated('includes/functions_content.' . $phpEx, $phpbb_root_path); phpbb_include_updated('includes/functions_compatibility.' . $phpEx, $phpbb_root_path); From 833a4c9e95adbbf7b879cde61a7d920d5ce176bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= Date: Wed, 14 Jun 2017 08:37:12 +0200 Subject: [PATCH 2/2] [ticket/15203] Remove require since is already in startup.php PHPBB3-15203 --- phpBB/install/phpbbcli.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index 4fe75bb0e3..4b86f64e2a 100755 --- a/phpBB/install/phpbbcli.php +++ b/phpBB/install/phpbbcli.php @@ -39,9 +39,6 @@ $input = new ArgvInput(); // Enable superglobals for cli support $phpbb_installer_container->get('request')->enable_super_globals(); -// Load compatibility globals to access deprecated globals -require($phpbb_root_path . 'includes/compatibility_globals.' . $phpEx); - /** @var \phpbb\filesystem\filesystem $phpbb_filesystem */ $phpbb_filesystem = $phpbb_installer_container->get('filesystem');