aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid M <davidmj@users.sourceforge.net>2007-06-10 16:13:43 +0000
committerDavid M <davidmj@users.sourceforge.net>2007-06-10 16:13:43 +0000
commiteff4e04a4e40bb4885e7275b8eb79d72a2b511c4 (patch)
tree14a05bcf0c5331ea86d6f889a3c3ca742e947972
parentafb7f26cccf999cc4a4a1fddf25ed24b585b45e0 (diff)
downloadforums-eff4e04a4e40bb4885e7275b8eb79d72a2b511c4.tar
forums-eff4e04a4e40bb4885e7275b8eb79d72a2b511c4.tar.gz
forums-eff4e04a4e40bb4885e7275b8eb79d72a2b511c4.tar.bz2
forums-eff4e04a4e40bb4885e7275b8eb79d72a2b511c4.tar.xz
forums-eff4e04a4e40bb4885e7275b8eb79d72a2b511c4.zip
#12189
git-svn-id: file:///svn/phpbb/trunk@7745 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/docs/CHANGELOG.html1
-rw-r--r--phpBB/includes/message_parser.php2
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 80573d5483..b16491a6cb 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -260,6 +260,7 @@ p a {
<li>[Fix] Allow for conversions to SQLite (Bug #12279) - patch provided by ToonArmy</li>
<li>[Fix] Apply colors to guests (Bug #12219)</li>
<li>[Fix] Set the Admin group as founder_manage during conversion (Bug #12287)</li>
+ <li>[Fix] Fixed a special quote BBCode case (Bug #12189)</li>
</ul>
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 370a409d2f..56c31b7818 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -690,7 +690,7 @@ class bbcode_firstpass extends bbcode
if ($tok == ']')
{
- if ($buffer == '/quote' && sizeof($close_tags))
+ if ($buffer == '/quote' && sizeof($close_tags) && substr($out, -1, 1) == '[')
{
// we have found a closing tag
$out .= array_pop($close_tags) . ']';