diff options
| author | Nils Adermann <naderman@naderman.de> | 2007-09-09 13:35:57 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2007-09-09 13:35:57 +0000 |
| commit | 183dcaf4275c73da17f4cf83be3001c9211fa4ac (patch) | |
| tree | 747c354ad77bb266be03a39fd86de1006fbb3272 /phpBB | |
| parent | c8ecf341b909f901bfef997fb5d753011303f716 (diff) | |
| download | forums-183dcaf4275c73da17f4cf83be3001c9211fa4ac.tar forums-183dcaf4275c73da17f4cf83be3001c9211fa4ac.tar.gz forums-183dcaf4275c73da17f4cf83be3001c9211fa4ac.tar.bz2 forums-183dcaf4275c73da17f4cf83be3001c9211fa4ac.tar.xz forums-183dcaf4275c73da17f4cf83be3001c9211fa4ac.zip | |
- 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
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/functions.php | 2 |
2 files changed, 2 insertions, 1 deletions
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 { <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> 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: |