aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/docs/CHANGELOG.html3
-rw-r--r--phpBB/includes/functions.php2
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 @@
<li>[Change] Allow setting birth year to current year.</li>
<li>[Fix] Display coloured username of last poster in list of subscribed forums (prosilver).</li>
<li>[Fix] Added missing UCP language string <em>NO_AUTH_READ_HOLD_MESSAGE</em>.</li>
- <li>[Fix] Do not jump back to page 1 when hiding member search in memberlist. (#32515 - Patch by paul)</li>
+ <li>[Fix] Do not jump back to page 1 when hiding member search in memberlist. (Bug #32515 - Patch by paul)</li>
<li>[Fix] Correctly limit input of the users location to 100 characters in the UCP and ACP. (Bug #32655)</li>
<li>[Fix] Sync reports when using the move all users posts tool in the ACP. (Bug #31165)</li>
+ <li>[Fix] Extra slash is included in the redirect url when redirecting to the forum root directory. (Bug #33605)</li>
</ul>
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;
}
}