git-svn-id: file:///svn/phpbb/trunk@7668 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2007-05-23 18:30:41 +00:00
parent 905beaa398
commit d180ac3d02
2 changed files with 3 additions and 2 deletions

View file

@ -200,6 +200,7 @@ p a {
<li>[Fix] Filled "SMILIEYS_DISABLED" template variable (Bug #11257)</li> <li>[Fix] Filled "SMILIEYS_DISABLED" template variable (Bug #11257)</li>
<li>[Fix] Properly escaped the delimiter in disallowed username comparisons (Bug #11339)</li> <li>[Fix] Properly escaped the delimiter in disallowed username comparisons (Bug #11339)</li>
<li>[Fix] Check global purge setting (Bug #11555)</li> <li>[Fix] Check global purge setting (Bug #11555)</li>
<li>[Fix] Improper magic url parsing applied to already parsed [url=] bbcode tag (Bug #11429)</li>
</ul> </ul>
</div> </div>

View file

@ -905,7 +905,7 @@ class bbcode_firstpass extends bbcode
$url = append_sid($url); $url = append_sid($url);
} }
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 ($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 '[url' . (($var1) ? '=' . $var1 : '') . ']' . $var2 . '[/url]'; return '[url' . (($var1) ? '=' . $var1 : '') . ']' . $var2 . '[/url]';