diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-05-23 18:30:41 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-05-23 18:30:41 +0000 |
| commit | d180ac3d02d0b3fc6abb79b66cd4b4cc691c1656 (patch) | |
| tree | 757aad16decbeac87d228c4d5d8e41ed50102139 /phpBB | |
| parent | 905beaa3984ca0d1fe0923a655f1d65ffac4bc80 (diff) | |
| download | forums-d180ac3d02d0b3fc6abb79b66cd4b4cc691c1656.tar forums-d180ac3d02d0b3fc6abb79b66cd4b4cc691c1656.tar.gz forums-d180ac3d02d0b3fc6abb79b66cd4b4cc691c1656.tar.bz2 forums-d180ac3d02d0b3fc6abb79b66cd4b4cc691c1656.tar.xz forums-d180ac3d02d0b3fc6abb79b66cd4b4cc691c1656.zip | |
#11429
git-svn-id: file:///svn/phpbb/trunk@7668 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 3 | ||||
| -rw-r--r-- | 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 { <li>[Fix] Proper sync of data on topic copy (Bug #11335)</li> <li>[Fix] Introduced ORDER BY clauses to converter queries (Bug #10697)</li> <li>[Fix] added a sync to post counts during conversion (Bug #11421)</li> - <li>[Fix] Stopped bots from getting added to the registered users group during conversion(Bug #11283)</li> + <li>[Fix] Stopped bots from getting added to the registered users group during conversion (Bug #11283)</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] Check global purge setting (Bug #11555)</li> + <li>[Fix] Improper magic url parsing applied to already parsed [url=] bbcode tag (Bug #11429)</li> </ul> </div> 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]'; |