From e5162e7496c2ae9ef5e5a874dab8e0a0409f3d74 Mon Sep 17 00:00:00 2001 From: Chris Smith Date: Fri, 5 Sep 2008 19:09:52 +0000 Subject: [PATCH] Extra slash is included in the redirect url when redirecting to the forum root directory. Closes #33605 Fix small mistake in CHANGELOG git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8832 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 3 ++- phpBB/includes/functions.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index e87b11bf09..08ce0606e7 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -110,9 +110,10 @@
  • [Change] Allow setting birth year to current year.
  • [Fix] Display coloured username of last poster in list of subscribed forums (prosilver).
  • [Fix] Added missing UCP language string NO_AUTH_READ_HOLD_MESSAGE.
    • -
  • [Fix] Do not jump back to page 1 when hiding member search in memberlist. (#32515 - Patch by paul)
    • +
  • [Fix] Do not jump back to page 1 when hiding member search in memberlist. (Bug #32515 - Patch by paul)
  • [Fix] Correctly limit input of the users location to 100 characters in the UCP and ACP. (Bug #32655)
  • [Fix] Sync reports when using the move all users posts tool in the ACP. (Bug #31165)
    • +
  • [Fix] Extra slash is included in the redirect url when redirecting to the forum root directory. (Bug #33605)
    • diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index e96583f75f..a68ada3540 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2044,7 +2044,7 @@ function redirect($url, $return = false, $disable_cd_check = false) $url = substr($url, 1); } - $url = $dir . '/' . $url; + $url = (!empty($dir) ? $dir . '/' : '') . $url; $url = generate_board_url() . '/' . $url; } }