mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-29 06:38:52 +00:00
git-svn-id: file:///svn/phpbb/trunk@7746 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
eff4e04a4e
commit
c4d442f8eb
2 changed files with 4 additions and 2 deletions
|
@ -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>
|
||||
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
Loading…
Add table
Reference in a new issue