diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-07-29 09:09:07 -0700 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-07-29 09:09:07 -0700 |
| commit | 49d908e95915994400224e2f3abf133b50fbff3e (patch) | |
| tree | be945aef60982c0afced702e8e149d1575f2357a /phpBB/viewtopic.php | |
| parent | 6da63f3ad877631b66c2d09724349aaa9c920381 (diff) | |
| parent | ccc5c5f6b8c197c0f96349e139472ddbe17f19ce (diff) | |
| download | forums-49d908e95915994400224e2f3abf133b50fbff3e.tar forums-49d908e95915994400224e2f3abf133b50fbff3e.tar.gz forums-49d908e95915994400224e2f3abf133b50fbff3e.tar.bz2 forums-49d908e95915994400224e2f3abf133b50fbff3e.tar.xz forums-49d908e95915994400224e2f3abf133b50fbff3e.zip | |
Merge pull request #1624 from brunoais/ticket/11638
[ticket/11638] Changed the layout to match the other similar commits
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index f34936951f..9510b047ca 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -832,19 +832,14 @@ if (!empty($topic_data['poll_start'])) $poll_total += $poll_option['poll_option_total']; } - $parse_bbcode_flags = OPTION_FLAG_SMILIES; - - if (empty($poll_info[0]['bbcode_bitfield'])) - { - $parse_bbcode_flags |= OPTION_FLAG_BBCODE; - } + $parse_flags = ($row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES; for ($i = 0, $size = sizeof($poll_info); $i < $size; $i++) { - $poll_info[$i]['poll_option_text'] = generate_text_for_display($poll_info[$i]['poll_option_text'], $poll_info[$i]['bbcode_uid'], $poll_option['bbcode_bitfield'], $parse_bbcode_flags, true); + $poll_info[$i]['poll_option_text'] = generate_text_for_display($poll_info[$i]['poll_option_text'], $poll_info[$i]['bbcode_uid'], $poll_option['bbcode_bitfield'], $parse_flags, true); } - $topic_data['poll_title'] = generate_text_for_display($topic_data['poll_title'], $poll_info[0]['bbcode_uid'], $poll_info[0]['bbcode_bitfield'], $parse_bbcode_flags, true); + $topic_data['poll_title'] = generate_text_for_display($topic_data['poll_title'], $poll_info[0]['bbcode_uid'], $poll_info[0]['bbcode_bitfield'], $parse_flags, true); foreach ($poll_info as $poll_option) { |