aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/request
diff options
context:
space:
mode:
authorIgor Wiedler <igor@wiedler.ch>2011-08-06 19:47:12 +0200
committerIgor Wiedler <igor@wiedler.ch>2011-08-06 19:47:12 +0200
commit24e9fb24d105b8e475dbaf66fd99be2839b86675 (patch)
tree204cee3e18b03f6ecf1ef7baf5eb6f47bcdb9409 /phpBB/includes/request
parentd1a0dfbafb8ee0710fec01bf16149f85810c29dd (diff)
downloadforums-24e9fb24d105b8e475dbaf66fd99be2839b86675.tar
forums-24e9fb24d105b8e475dbaf66fd99be2839b86675.tar.gz
forums-24e9fb24d105b8e475dbaf66fd99be2839b86675.tar.bz2
forums-24e9fb24d105b8e475dbaf66fd99be2839b86675.tar.xz
forums-24e9fb24d105b8e475dbaf66fd99be2839b86675.zip
[feature/request-class] Make server() use the $html_encode parameter
$request->server() should not auto html-escape values. header() however should. Also introduce some tests for this behaviour. Thanks to nn- for catching this. PHPBB3-9716
Diffstat (limited to 'phpBB/includes/request')
-rw-r--r--phpBB/includes/request/request.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/request/request.php b/phpBB/includes/request/request.php
index 13493387a8..466397480b 100644
--- a/phpBB/includes/request/request.php
+++ b/phpBB/includes/request/request.php
@@ -261,12 +261,12 @@ class phpbb_request implements phpbb_request_interface
if ($this->is_set($var_name, phpbb_request_interface::SERVER))
{
- return $this->variable($var_name, $default, $multibyte, phpbb_request_interface::SERVER);
+ return $this->variable($var_name, $default, $multibyte, phpbb_request_interface::SERVER, $html_encode);
}
else
{
$var = getenv($var_name);
- $this->type_cast_helper->recursive_set_var($var, $default, $multibyte);
+ $this->type_cast_helper->recursive_set_var($var, $default, $multibyte, $html_encode);
return $var;
}
}