From c4d442f8eb29eb12393720ea9c015307c8e50989 Mon Sep 17 00:00:00 2001 From: David M Date: Sun, 10 Jun 2007 19:50:53 +0000 Subject: [PATCH] #11833 git-svn-id: file:///svn/phpbb/trunk@7746 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 1 + phpBB/includes/message_parser.php | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index b16491a6cb..c5d3ca86a7 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -261,6 +261,7 @@ p a {
  • [Fix] Apply colors to guests (Bug #12219)
  • [Fix] Set the Admin group as founder_manage during conversion (Bug #12287)
  • [Fix] Fixed a special quote BBCode case (Bug #12189)
    • +
  • [Fix] Correctly parse BBCodes in a post when a poll is being used (Bug #11833)
    • diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index 56c31b7818..6a00aaf4e0 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -1538,6 +1538,7 @@ class parse_message extends bbcode_firstpass // Parse Poll Option text ;) $tmp_message = $this->message; + $tmp_bitfield = $this->bbcode_bitfield; $this->message = $poll['poll_option_text']; @@ -1570,8 +1571,8 @@ class parse_message extends bbcode_firstpass } $this->message = $tmp_message; - - unset($tmp_message); + $this->bbcode_bitfield = $tmp_bitfield; + unset($tmp_message, $tmp_bitfield); if (sizeof($poll['poll_options']) == 1) {