makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

better fix for (Bug #37055)

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9085 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Nils Adermann 2008-11-22 23:17:05 +00:00
parent dcea9f082a
commit 81a1803c43
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/includes/functions_content.php
View file

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