diff options
| author | Bruno Ais <brunoaiss@gmail.com> | 2013-07-13 13:49:19 +0100 |
|---|---|---|
| committer | Bruno Ais <brunoaiss@gmail.com> | 2013-07-13 16:38:51 +0100 |
| commit | b4fcdc51e9df126faf5e9aabcbaa50bb33da0bd0 (patch) | |
| tree | e587ee1f879e11c4f8745dd3675fef0fe31cc4ea /phpBB/viewtopic.php | |
| parent | b5651c0289054f2f4453806200506968241f9a82 (diff) | |
| download | forums-b4fcdc51e9df126faf5e9aabcbaa50bb33da0bd0.tar forums-b4fcdc51e9df126faf5e9aabcbaa50bb33da0bd0.tar.gz forums-b4fcdc51e9df126faf5e9aabcbaa50bb33da0bd0.tar.bz2 forums-b4fcdc51e9df126faf5e9aabcbaa50bb33da0bd0.tar.xz forums-b4fcdc51e9df126faf5e9aabcbaa50bb33da0bd0.zip | |
[ticket/11638] generate_text_for_display on viewtopic.php
lines: 835-843
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*
PHPBB3-11638
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 4dd03202f1..6b789bbb99 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -828,26 +828,15 @@ if (!empty($topic_data['poll_start'])) $poll_total += $poll_option['poll_option_total']; } - if ($poll_info[0]['bbcode_bitfield']) - { - $poll_bbcode = new bbcode(); - } - else - { - $poll_bbcode = false; + $parse_bbcode_flags = OPTION_FLAG_SMILIES; + + if(empty($poll_info[0]['bbcode_bitfield'])){ + $parse_bbcode_flags |= OPTION_FLAG_BBCODE; } for ($i = 0, $size = sizeof($poll_info); $i < $size; $i++) { - $poll_info[$i]['poll_option_text'] = censor_text($poll_info[$i]['poll_option_text']); - - if ($poll_bbcode !== false) - { - $poll_bbcode->bbcode_second_pass($poll_info[$i]['poll_option_text'], $poll_info[$i]['bbcode_uid'], $poll_option['bbcode_bitfield']); - } - - $poll_info[$i]['poll_option_text'] = bbcode_nl2br($poll_info[$i]['poll_option_text']); - $poll_info[$i]['poll_option_text'] = smiley_text($poll_info[$i]['poll_option_text']); + $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); } $topic_data['poll_title'] = censor_text($topic_data['poll_title']); |