diff options
| author | Bruno Ais <brunoaiss@gmail.com> | 2013-07-29 17:00:51 +0100 |
|---|---|---|
| committer | Bruno Ais <brunoaiss@gmail.com> | 2013-07-29 17:00:51 +0100 |
| commit | ccc5c5f6b8c197c0f96349e139472ddbe17f19ce (patch) | |
| tree | 766bf5502e73c7d2131885fa741c476c75a16e75 | |
| parent | 4cdccbd42b2f6ee54c6edb7f96ec3a0cac2ae8ea (diff) | |
| download | forums-ccc5c5f6b8c197c0f96349e139472ddbe17f19ce.tar forums-ccc5c5f6b8c197c0f96349e139472ddbe17f19ce.tar.gz forums-ccc5c5f6b8c197c0f96349e139472ddbe17f19ce.tar.bz2 forums-ccc5c5f6b8c197c0f96349e139472ddbe17f19ce.tar.xz forums-ccc5c5f6b8c197c0f96349e139472ddbe17f19ce.zip | |
[ticket/11638] Changed the layout to match the other similar commits
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*
PHPBB3-11638
| -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 64006fbe61..a24c40f697 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -828,19 +828,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) { |