diff options
| author | Joseph Warner <hardolaf@hardolaf.com> | 2013-07-01 22:37:55 -0400 |
|---|---|---|
| committer | Joseph Warner <hardolaf@hardolaf.com> | 2013-07-01 22:40:49 -0400 |
| commit | f48effb00197a9ace8de82f3a961992215113257 (patch) | |
| tree | 7bd9a85a5f7f4f07a37a1021a91974a7ab2b7fc1 /phpBB/install | |
| parent | 66118ea49e2dc1a54ce1a76fa4856ff158df9511 (diff) | |
| download | forums-f48effb00197a9ace8de82f3a961992215113257.tar forums-f48effb00197a9ace8de82f3a961992215113257.tar.gz forums-f48effb00197a9ace8de82f3a961992215113257.tar.bz2 forums-f48effb00197a9ace8de82f3a961992215113257.tar.xz forums-f48effb00197a9ace8de82f3a961992215113257.zip | |
[feature/auth-refactor] Fix the actual cause of test failures
Enables super globals before the new container is instantiated in
the final step of installation to prevent issues caused by trying
to create a phpbb_request object when super globals are disabled.
PHPBB3-9734
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/install_install.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 5bf3f572d9..3d7b6f7c88 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -53,7 +53,7 @@ class install_install extends module function main($mode, $sub) { global $lang, $template, $language, $phpbb_root_path, $phpEx; - global $phpbb_container, $cache, $phpbb_log; + global $phpbb_container, $cache, $phpbb_log, $request; switch ($sub) { @@ -102,6 +102,9 @@ class install_install extends module break; case 'final': + // Enable super globals to prevent issues with the new phpbb_request object + $request->enable_super_globals(); + // Create a normal container now $phpbb_container = phpbb_create_default_container($phpbb_root_path, $phpEx); |