From d180ac3d02d0b3fc6abb79b66cd4b4cc691c1656 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Wed, 23 May 2007 18:30:41 +0000 Subject: [PATCH] #11429 git-svn-id: file:///svn/phpbb/trunk@7668 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 3 ++- phpBB/includes/message_parser.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index eaad188e45..275707cce2 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -196,10 +196,11 @@ p a {
  • [Fix] Proper sync of data on topic copy (Bug #11335)
  • [Fix] Introduced ORDER BY clauses to converter queries (Bug #10697)
  • [Fix] added a sync to post counts during conversion (Bug #11421)
    • -
  • [Fix] Stopped bots from getting added to the registered users group during conversion(Bug #11283)
    • +
  • [Fix] Stopped bots from getting added to the registered users group during conversion (Bug #11283)
  • [Fix] Filled "SMILIEYS_DISABLED" template variable (Bug #11257)
  • [Fix] Properly escaped the delimiter in disallowed username comparisons (Bug #11339)
  • [Fix] Check global purge setting (Bug #11555)
    • +
  • [Fix] Improper magic url parsing applied to already parsed [url=] bbcode tag (Bug #11429)
    • diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index b8f00d71ee..a593dffec6 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -905,7 +905,7 @@ class bbcode_firstpass extends bbcode $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]';