aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorJoseph Warner <hardolaf@hardolaf.com>2013-07-01 22:37:55 -0400
committerJoseph Warner <hardolaf@hardolaf.com>2013-07-01 22:40:49 -0400
commitf48effb00197a9ace8de82f3a961992215113257 (patch)
tree7bd9a85a5f7f4f07a37a1021a91974a7ab2b7fc1 /phpBB/includes
parent66118ea49e2dc1a54ce1a76fa4856ff158df9511 (diff)
downloadforums-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/includes')
-rw-r--r--phpBB/includes/request/request.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/request/request.php b/phpBB/includes/request/request.php
index c0bb453c7c..ae3c526d89 100644
--- a/phpBB/includes/request/request.php
+++ b/phpBB/includes/request/request.php
@@ -79,7 +79,7 @@ class phpbb_request implements phpbb_request_interface
// simulate request_order = GP
$this->original_request = $this->input[phpbb_request_interface::REQUEST];
- $this->input[phpbb_request_interface::REQUEST] = (array)$this->input[phpbb_request_interface::POST] + (array)$this->input[phpbb_request_interface::GET];
+ $this->input[phpbb_request_interface::REQUEST] = $this->input[phpbb_request_interface::POST] + $this->input[phpbb_request_interface::GET];
if ($disable_super_globals)
{