1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-24 09:30:34 +01:00

Merge pull request #4848 from rubencm/ticket/15203

[ticket/15203] Include missing constants in web installer
This commit is contained in:
Marc Alexander 2017-06-25 10:29:49 +02:00
commit 3b8a155de0
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
2 changed files with 1 additions and 3 deletions

View File

@ -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');

View File

@ -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);