aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2010-12-16 02:22:17 +0100
committerAndreas Fischer <bantu@phpbb.com>2010-12-16 02:22:17 +0100
commit442fc61be77787c211650f21b2fb485f5e6ffcf0 (patch)
tree804ce33f487ab3f9d1ed19db203a91522d4dd184 /tests
parent8b9b1f118726e9fb088737129a02e9959ac1adc4 (diff)
parentb08e0d17728f8733a403834a8ffa85b01c16d805 (diff)
downloadforums-442fc61be77787c211650f21b2fb485f5e6ffcf0.tar
forums-442fc61be77787c211650f21b2fb485f5e6ffcf0.tar.gz
forums-442fc61be77787c211650f21b2fb485f5e6ffcf0.tar.bz2
forums-442fc61be77787c211650f21b2fb485f5e6ffcf0.tar.xz
forums-442fc61be77787c211650f21b2fb485f5e6ffcf0.zip
Merge branch 'feature/igorw/request-class' into develop
* feature/igorw/request-class: [feature/request-class] Convert some remaining cookies [feature/request-class] Adjust misleading comment [feature/request-class] Remove direct access to _REQUEST in acp_search [feature/request-class] Special case of direct access to _REQUEST
Diffstat (limited to 'tests')
-rw-r--r--tests/request/request_var.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/request/request_var.php b/tests/request/request_var.php
index 1c360d45d0..53a4d8097b 100644
--- a/tests/request/request_var.php
+++ b/tests/request/request_var.php
@@ -87,7 +87,7 @@ class phpbb_request_var_test extends phpbb_test_case
$this->unset_variables('var');
// cannot set $_REQUEST directly because in phpbb_request implementation
- // $_REQUEST = $_GET + $_POST
+ // $_REQUEST = $_POST + $_GET
$_POST['var'] = array(
0 => array(
'b' => array(