diff options
| author | Bruno Ais <brunoaiss@gmail.com> | 2013-07-13 13:50:44 +0100 |
|---|---|---|
| committer | Bruno Ais <brunoaiss@gmail.com> | 2013-07-13 16:39:29 +0100 |
| commit | 97054d81f82123f17cd3680326932a8fd021ffa2 (patch) | |
| tree | 6c1629a7d5931613ae925da7ebc800cee83806f1 /phpBB | |
| parent | b4fcdc51e9df126faf5e9aabcbaa50bb33da0bd0 (diff) | |
| download | forums-97054d81f82123f17cd3680326932a8fd021ffa2.tar forums-97054d81f82123f17cd3680326932a8fd021ffa2.tar.gz forums-97054d81f82123f17cd3680326932a8fd021ffa2.tar.bz2 forums-97054d81f82123f17cd3680326932a8fd021ffa2.tar.xz forums-97054d81f82123f17cd3680326932a8fd021ffa2.zip | |
[ticket/11638] generate_text_for_display on viewtopic.php
lines: 846-854
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*
PHPBB3-11638
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/viewtopic.php | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 6b789bbb99..d295b91f43 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -839,17 +839,9 @@ if (!empty($topic_data['poll_start'])) $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']); - - if ($poll_bbcode !== false) - { - $poll_bbcode->bbcode_second_pass($topic_data['poll_title'], $poll_info[0]['bbcode_uid'], $poll_info[0]['bbcode_bitfield']); - } - - $topic_data['poll_title'] = bbcode_nl2br($topic_data['poll_title']); - $topic_data['poll_title'] = smiley_text($topic_data['poll_title']); - - unset($poll_bbcode); + $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); + + unset($parse_bbcode_flags); foreach ($poll_info as $poll_option) { |