aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Wigginton <terrafrost@phpbb.com>2009-01-26 22:53:19 +0000
committerJim Wigginton <terrafrost@phpbb.com>2009-01-26 22:53:19 +0000
commitf78594b59d14a3451feb1af0de90a22cfe2b5b1c (patch)
treeffe48cafdac07af60fa2934b421912705f4071a3
parent4b176e6ca71e3e05157631372945f4917439b15b (diff)
downloadforums-f78594b59d14a3451feb1af0de90a22cfe2b5b1c.tar
forums-f78594b59d14a3451feb1af0de90a22cfe2b5b1c.tar.gz
forums-f78594b59d14a3451feb1af0de90a22cfe2b5b1c.tar.bz2
forums-f78594b59d14a3451feb1af0de90a22cfe2b5b1c.tar.xz
forums-f78594b59d14a3451feb1af0de90a22cfe2b5b1c.zip
Fixed bug #40565 – Missing end " in quote bb tag deletes text
Authorised by: acydburn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9304 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/docs/CHANGELOG.html1
-rw-r--r--phpBB/includes/message_parser.php3
2 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 6fd2da068a..907dab34c5 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -89,6 +89,7 @@
<ul>
<li>[Fix] Delete user entry from ban list table upon user deletion (Bug #40015 - Patch by TerraFrost)</li>
<li>[Fix] Posts incremented for multiple approval of the same topic (Bug #40495 - Patch by TerraFrost)</li>
+ <li>[Fix] Missing end " in quote bb tag deletes text (Bug #40565 - Patch by TerraFrost)</li>
<li>[Fix] Missing read permission from calls to phpbb_chmod()</li>
<li>[Fix] Correctly display future dates (Bug #38755)</li>
<li>[Change] Allow download of conflicting file for later reference in automatic updater</li>
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 4e350bce99..b97a055fde 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -695,6 +695,7 @@ class bbcode_firstpass extends bbcode
* [quote="[i]test[/i]"]test[/quote] (correct: parsed)
* [quote="[quote]test[/quote]"]test[/quote] (correct: parsed - Username displayed as [quote]test[/quote])
* #20735 - [quote]test[/[/b]quote] test [/quote][/quote] test - (correct: quoted: "test[/[/b]quote] test" / non-quoted: "[/quote] test" - also failed if layout distorted)
+ * #40565 - [quote="a"]a[/quote][quote="a]a[/quote] (correct: first quote tag parsed, second quote tag unparsed)
*/
$in = str_replace("\r\n", "\n", str_replace('\"', '"', trim($in)));
@@ -858,6 +859,8 @@ class bbcode_firstpass extends bbcode
}
while ($in);
+ $out .= $buffer;
+
if (sizeof($close_tags))
{
$out .= '[' . implode('][', $close_tags) . ']';