diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-04 11:19:10 -0500 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-04 11:19:10 -0500 |
| commit | 35b628f737014eec0872ed7d0d140f11621af261 (patch) | |
| tree | a84745e078cfa8078229739b7fa851bae946ceb8 /phpBB/install | |
| parent | b7ede06835ba784b81365946f057adf75ae7592b (diff) | |
| parent | b3487b3167632f47d98eef25692924aa7ab25863 (diff) | |
| download | forums-35b628f737014eec0872ed7d0d140f11621af261.tar forums-35b628f737014eec0872ed7d0d140f11621af261.tar.gz forums-35b628f737014eec0872ed7d0d140f11621af261.tar.bz2 forums-35b628f737014eec0872ed7d0d140f11621af261.tar.xz forums-35b628f737014eec0872ed7d0d140f11621af261.zip | |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twig
# By Joseph Warner (44) and others
# Via Joas Schilling (4) and others
* 'develop' of https://github.com/phpbb/phpbb3: (63 commits)
[ticket/11617] Remove spaces and tabs from empty lines
[ticket/11617] Missing U_ACTION in acp_captcha.php
[feature/auth-refactor] Fix code style issue
[feature/auth-refactor] Fix comment grammar
[feature/auth-refactor] Fix the actual cause of test failures
[feature/auth-refactor] A possible fix for the functional test failures
[ticket/11566] Subsilver template error displayed after table headers
[ticket/11566] Remove extra pair of brackets from conditional statement
[ticket/11566] Check that guest doesn't have reporting permission by default
[ticket/11566] Add captcha to report post template in subsilver
[ticket/11566] Use the new constant CONFIRM_REPORT for captcha init
[ticket/11566] Rename var to $visual_confirmation_response
[ticket/11566] Revert forum permission changes
[ticket/11566] Use language variable instead of hardcode
[ticket/11566] add tests for reporting post
[ticket/11566] add captcha reset and hidden fields
[ticket/11566] display error instead of trigger_error
[ticket/11566] add error in template
[ticket/11566] add error functionality
[ticket/11566] add interface for captcha
...
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); |