diff options
| author | Nils Adermann <naderman@naderman.de> | 2008-11-22 23:17:05 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2008-11-22 23:17:05 +0000 |
| commit | 81a1803c439f99863a499685b0e519b03b5362a1 (patch) | |
| tree | 9b6027f473458d86b7f24b9c2b8993b936deab85 /phpBB/includes | |
| parent | dcea9f082a3392f09f2753f1cba761f36a6b74ec (diff) | |
| download | forums-81a1803c439f99863a499685b0e519b03b5362a1.tar forums-81a1803c439f99863a499685b0e519b03b5362a1.tar.gz forums-81a1803c439f99863a499685b0e519b03b5362a1.tar.bz2 forums-81a1803c439f99863a499685b0e519b03b5362a1.tar.xz forums-81a1803c439f99863a499685b0e519b03b5362a1.zip | |
better fix for (Bug #37055)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9085 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions_content.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index caa1b470d6..88b7e77caa 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -501,7 +501,8 @@ function generate_text_for_edit($text, $uid, $flags) */ function make_clickable_callback($type, $whitespace, $url, $relative_url, $class) { - $orig_url = $url . $relative_url; + $orig_url = $url; + $orig_relative = $relative_url; $append = ''; $url = htmlspecialchars_decode($url); $relative_url = htmlspecialchars_decode($relative_url); @@ -565,8 +566,6 @@ function make_clickable_callback($type, $whitespace, $url, $relative_url, $class { $url = substr($url, 0, -1); } - // appends last_char to orig_url to retrieve real original url - $orig_url = substr($orig_url, 0, -1); break; // set last_char to empty here, so the variable can be used later to @@ -591,7 +590,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 $whitespace . $orig_url . '/' . $last_char; // slash is taken away by relative url pattern + return $whitespace . $orig_url . '/' . $orig_relative; // slash is taken away by relative url pattern } break; |