1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00

fix an improper fix.

- generally, sorry, but direct url parsing after ] will no longer work...
- try to eliminate the most common "bug" for placing urls within the [url=][/url] part (the text). This will trigger make_clickable and render the url invalid (doubled url), moreso if other text is involved too. This is still te case if the url is not written directly after the [url=] part. This is nearly the best we can get within 3.0.x - and every report about [url=], [url] and make_clickable and it's non-parsing or parsing will be closed with "will not fix", except it is a critical bug resulting in the non-functioning of the board. We may adjust this later to our own liking while we try to find different ways to face these problems.


git-svn-id: file:///svn/phpbb/trunk@7681 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2007-05-25 18:00:22 +00:00
parent 79600289e7
commit e6f46e65a7
2 changed files with 7 additions and 5 deletions

View File

@@ -905,7 +905,7 @@ class bbcode_firstpass extends bbcode
$url = append_sid($url);
}
return ($var1) ? '[url=' . $this->bbcode_specialchars($url) . ':' . $this->bbcode_uid . ']' . $this->bbcode_specialchars($var2) . '[/url:' . $this->bbcode_uid . ']' : '[url:' . $this->bbcode_uid . ']' . $this->bbcode_specialchars($url) . '[/url:' . $this->bbcode_uid . ']';
return ($var1) ? '[url=' . $this->bbcode_specialchars($url) . ':' . $this->bbcode_uid . ']' . $var2 . '[/url:' . $this->bbcode_uid . ']' : '[url:' . $this->bbcode_uid . ']' . $this->bbcode_specialchars($url) . '[/url:' . $this->bbcode_uid . ']';
}
return '[url' . (($var1) ? '=' . $var1 : '') . ']' . $var2 . '[/url]';