diff options
| author | David M <davidmj@users.sourceforge.net> | 2007-06-10 19:50:53 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2007-06-10 19:50:53 +0000 |
| commit | c4d442f8eb29eb12393720ea9c015307c8e50989 (patch) | |
| tree | 5369fb5a48def9848446126970a2c34dff34ac70 | |
| parent | eff4e04a4e40bb4885e7275b8eb79d72a2b511c4 (diff) | |
| download | forums-c4d442f8eb29eb12393720ea9c015307c8e50989.tar forums-c4d442f8eb29eb12393720ea9c015307c8e50989.tar.gz forums-c4d442f8eb29eb12393720ea9c015307c8e50989.tar.bz2 forums-c4d442f8eb29eb12393720ea9c015307c8e50989.tar.xz forums-c4d442f8eb29eb12393720ea9c015307c8e50989.zip | |
#11833
git-svn-id: file:///svn/phpbb/trunk@7746 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | 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 { <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> + <li>[Fix] Correctly parse BBCodes in a post when a poll is being used (Bug #11833)</li> </ul> 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) { |