diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-17 22:00:06 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-17 22:00:06 -0500 |
| commit | 9c535da52888d60aecef9799062974e375f22f82 (patch) | |
| tree | 10535287df7d56dbb2111b655a653f78a3ffc1f1 /phpBB/phpbb/session.php | |
| parent | f4317bc864f9c19a15de83ea30cb46a04c95a295 (diff) | |
| download | forums-9c535da52888d60aecef9799062974e375f22f82.tar forums-9c535da52888d60aecef9799062974e375f22f82.tar.gz forums-9c535da52888d60aecef9799062974e375f22f82.tar.bz2 forums-9c535da52888d60aecef9799062974e375f22f82.tar.xz forums-9c535da52888d60aecef9799062974e375f22f82.zip | |
[ticket/11850] page_name contains controller request rather than query string
Fixing tests
PHPBB3-11850
Diffstat (limited to 'phpBB/phpbb/session.php')
| -rw-r--r-- | phpBB/phpbb/session.php | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php index 52f621dbf6..1752291cf2 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -87,6 +87,12 @@ class phpbb_session $page_name = (substr($script_name, -1, 1) == '/') ? '' : basename($script_name); $page_name = urlencode(htmlspecialchars($page_name)); + $symfony_request_path = $phpbb_filesystem->clean_path($symfony_request->getPathInfo()); + if ($symfony_request_path !== '/') + { + $page_name .= $symfony_request_path; + } + // current directory within the phpBB root (for example: adm) $root_dirs = explode('/', str_replace('\\', '/', phpbb_realpath($root_path))); $page_dirs = explode('/', str_replace('\\', '/', phpbb_realpath('./'))); @@ -103,12 +109,7 @@ class phpbb_session } // Current page from phpBB root (for example: adm/index.php?i=10&b=2) - $symfony_request_path = $phpbb_filesystem->clean_path($symfony_request->getPathInfo()); $page = (($page_dir) ? $page_dir . '/' : '') . $page_name; - if ($symfony_request_path !== '/') - { - $page .= $symfony_request_path; - } if ($query_string) { $page .= '?' . $query_string; |