From 183dcaf4275c73da17f4cf83be3001c9211fa4ac Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Sun, 9 Sep 2007 13:35:57 +0000 Subject: [PATCH] - http://www.boardlocation.tld/phpBB/ links will not get an extra trailing slash with magic url anymore [Bug #14362] git-svn-id: file:///svn/phpbb/trunk@8084 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 1 + phpBB/includes/functions.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 616ceb3098..43afbd4411 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -203,6 +203,7 @@ p a {
  • [Fix] Fixing private message on-hold code if moving messages into folder based on rules (Bug #14309)
  • [Fix] Allow the merge selection screen to work (Bug #14363)
  • [Change] Require additional permissions for copying permission when editing forums
    • +
  • [Fix] Local magic URLs no longer get an additional trailing slash (Bug #14362)
    • diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 9f75438e84..2ce788e80a 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2711,7 +2711,7 @@ function make_clickable_callback($type, $whitespace, $url, $relative_url, $class $tag = 'l'; $relative_url = preg_replace('/[&?]sid=[0-9a-f]{32}$/', '', preg_replace('/([&?])sid=[0-9a-f]{32}&/', '$1', $relative_url)); $url = $url . '/' . $relative_url; - $text = ($relative_url) ? $relative_url : $url . '/'; + $text = ($relative_url) ? $relative_url : $url; break; case MAGIC_URL_FULL: