mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 05:50:42 +02:00
Code Issues Releases Wiki Activity

[ticket/11850] page_name contains controller request rather than query string

Browse Source 
Fixing tests

PHPBB3-11850
This commit is contained in:
Nathan Guse
2013-09-17 22:00:06 -05:00
parent f4317bc864
commit 9c535da528
4 changed files with 59 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
phpBB/phpbb/session.php
View File

@@ -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;