aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2008-05-18 18:57:37 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2008-05-18 18:57:37 +0000
commitaf63e0ee845187db24a137317849c4619c137a3b (patch)
tree7b9722d21415e386563b072d02b0a5d2f3953f7f /phpBB
parentae060e8aefb7d0bbb276518cb4a78e1e130d1580 (diff)
downloadforums-af63e0ee845187db24a137317849c4619c137a3b.tar
forums-af63e0ee845187db24a137317849c4619c137a3b.tar.gz
forums-af63e0ee845187db24a137317849c4619c137a3b.tar.bz2
forums-af63e0ee845187db24a137317849c4619c137a3b.tar.xz
forums-af63e0ee845187db24a137317849c4619c137a3b.zip
fix for bug #27355
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8561 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/docs/CHANGELOG.html1
-rw-r--r--phpBB/includes/functions_content.php2
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index ef68d5113d..9ad93e8fea 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -106,6 +106,7 @@
<li>[Feature] Added optional referer validation of POST requests as additional CSRF protection.</li>
<li>[Fix] Added missing form token in acp (thanks NBBN).</li>
<li>[Feature] Added optional stricter upload validation to avoid mime sniffing in addition to the safeguards provided by file.php. (thanks to Nicolas Grekas for compiling the list).</li>
+ <li>[Fix] Do not remove whitespace in front of url containing the boards url and no relative path appended (Bug #27355)</li>
</ul>
<a name="v300"></a><h3>1.ii. Changes since 3.0.0</h3>
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php
index 9eab477a8a..79c32c4e08 100644
--- a/phpBB/includes/functions_content.php
+++ b/phpBB/includes/functions_content.php
@@ -574,7 +574,7 @@ function make_clickable_callback($type, $whitespace, $url, $relative_url, $class
// don't touch it and let MAGIC_URL_FULL take care of it.
if (!$relative_url)
{
- return $orig_url . '/'; // slash is taken away by relative url pattern
+ return $whitespace . $orig_url . '/'; // slash is taken away by relative url pattern
}
break;