diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-07 21:56:48 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-07 21:56:48 +0100 |
| commit | 23141a2c519a62161a21196a8b045218f8717bd4 (patch) | |
| tree | 9379499c2003656d46eb41890952e63da5491406 /phpBB | |
| parent | 62e0c325b48046e3503cd3b9f60c3c7371dedfc1 (diff) | |
| parent | c52a7e9a083d1bbd68f515bfdec2dbe1ebdef954 (diff) | |
| download | forums-23141a2c519a62161a21196a8b045218f8717bd4.tar forums-23141a2c519a62161a21196a8b045218f8717bd4.tar.gz forums-23141a2c519a62161a21196a8b045218f8717bd4.tar.bz2 forums-23141a2c519a62161a21196a8b045218f8717bd4.tar.xz forums-23141a2c519a62161a21196a8b045218f8717bd4.zip | |
Merge branch 'bug/dpward/58755' into develop-olympus
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/session.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 49c8d1364b..7b8d8f63f2 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -102,6 +102,7 @@ <li>[Fix] Parsing urls in signatures properly uses config settings. (Bug #57105)</li> <li>[Fix] Allow multibyte keys in request_var(). (Bug #51555)</li> <li>[Fix] Prevent wrong tar archive type detection. (Bug #12531)</li> + <li>[Fix] Correct redirection after login to forum not in web root (Bug #58755)</li> <li>[Feature] Support for Microsoft's Native SQL Server Driver for PHP (Bug #57055 - Patch by Chris Pucci at Microsoft)</li> </ul> diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index 11f1896332..1a302d5991 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -83,7 +83,7 @@ class session $query_string = trim(implode('&', $use_args)); // basenamed page name (for example: index.php) - $page_name = basename($script_name); + $page_name = (substr($script_name, -1, 1) == '/') ? '' : basename($script_name); $page_name = urlencode(htmlspecialchars($page_name)); // current directory within the phpBB root (for example: adm) |