aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/session.php
diff options
context:
space:
mode:
authorTristan Darricau <github@nicofuma.fr>2014-11-07 11:10:26 +0100
committerTristan Darricau <github@nicofuma.fr>2014-11-07 11:10:26 +0100
commit122c1c6e05c0c7d1fe282ecd09d833405c975993 (patch)
tree7b88fc3bfe7792b730c20a24bd31b4bacb2deb8f /phpBB/phpbb/session.php
parent29d2a7bc9f0afd074fd0b4afdf9015a70bd06940 (diff)
parenta1b58d05d158ff7afd789c1b27821e17198f8d58 (diff)
downloadforums-122c1c6e05c0c7d1fe282ecd09d833405c975993.tar
forums-122c1c6e05c0c7d1fe282ecd09d833405c975993.tar.gz
forums-122c1c6e05c0c7d1fe282ecd09d833405c975993.tar.bz2
forums-122c1c6e05c0c7d1fe282ecd09d833405c975993.tar.xz
forums-122c1c6e05c0c7d1fe282ecd09d833405c975993.zip
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: [ticket/13280] Remove unneeded str_replace in build_url() [ticket/13280] Only run sanitizer for server superglobal and modify tests [ticket/13280] Seperate server sanitizer call and add comment [ticket/13280] Add additional sanitizer for ampersands in server superglobal [ticket/13280] Correctly format user page for build_url() [ticket/13280] Properly format the current page and add sanitizer to tests
Diffstat (limited to 'phpBB/phpbb/session.php')
-rw-r--r--phpBB/phpbb/session.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php
index 14b4c63207..a06ff9c594 100644
--- a/phpBB/phpbb/session.php
+++ b/phpBB/phpbb/session.php
@@ -43,7 +43,7 @@ class session
// First of all, get the request uri...
$script_name = $symfony_request->getScriptName();
- $args = explode('&', $symfony_request->getQueryString());
+ $args = explode('&amp;', $symfony_request->getQueryString());
// If we are unable to get the script name we use REQUEST_URI as a failover and note it within the page array for easier support...
if (!$script_name)
@@ -61,8 +61,8 @@ class session
// Since some browser do not encode correctly we need to do this with some "special" characters...
// " -> %22, ' => %27, < -> %3C, > -> %3E
- $find = array('"', "'", '<', '>');
- $replace = array('%22', '%27', '%3C', '%3E');
+ $find = array('"', "'", '<', '>', '&quot;', '&lt;', '&gt;');
+ $replace = array('%22', '%27', '%3C', '%3E', '%22', '%3C', '%3E');
foreach ($args as $key => $argument)
{