- 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
This commit is contained in:
Nils Adermann 2007-09-09 13:35:57 +00:00
parent c8ecf341b9
commit 183dcaf427
2 changed files with 2 additions and 1 deletions

View file

@ -203,6 +203,7 @@ p a {
<li>[Fix] Fixing private message on-hold code if moving messages into folder based on rules (Bug #14309)</li>
<li>[Fix] Allow the merge selection screen to work (Bug #14363)</li>
<li>[Change] Require additional permissions for copying permission when editing forums </li>
<li>[Fix] Local magic URLs no longer get an additional trailing slash (Bug #14362)</li>
</ul>
</div>

View file

@ -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: