diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-07-04 00:14:48 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-07-04 00:14:48 +0200 |
| commit | 68f001aaaf761268975d38d7ddcbdf024bb26def (patch) | |
| tree | afa75c51f61239f8ed842de8a8487a1b155ca69d /phpBB/install/install_install.php | |
| parent | 6fc997924c2c9792c8151db67e3273202951de3e (diff) | |
| parent | b3487b3167632f47d98eef25692924aa7ab25863 (diff) | |
| download | forums-68f001aaaf761268975d38d7ddcbdf024bb26def.tar forums-68f001aaaf761268975d38d7ddcbdf024bb26def.tar.gz forums-68f001aaaf761268975d38d7ddcbdf024bb26def.tar.bz2 forums-68f001aaaf761268975d38d7ddcbdf024bb26def.tar.xz forums-68f001aaaf761268975d38d7ddcbdf024bb26def.zip | |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11600
Diffstat (limited to 'phpBB/install/install_install.php')
| -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); |