diff options
| author | Bruno Ais <brunoaiss@gmail.com> | 2013-07-13 14:35:50 +0100 |
|---|---|---|
| committer | Bruno Ais <brunoaiss@gmail.com> | 2013-07-13 16:57:00 +0100 |
| commit | 713a2ba573ab49d2add2522392b1f91ca3065dea (patch) | |
| tree | ca9b6704a6b44a0d773207ca3d020f2de93f35d2 /phpBB | |
| parent | a58ccdabf30cad5b0373c266fc69368c65cee1a1 (diff) | |
| download | forums-713a2ba573ab49d2add2522392b1f91ca3065dea.tar forums-713a2ba573ab49d2add2522392b1f91ca3065dea.tar.gz forums-713a2ba573ab49d2add2522392b1f91ca3065dea.tar.bz2 forums-713a2ba573ab49d2add2522392b1f91ca3065dea.tar.xz forums-713a2ba573ab49d2add2522392b1f91ca3065dea.zip | |
[ticket/11638] generate_text_for_display on viewtopic.php
lines: 1403-1417
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 | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 34586b1491..9274539ab4 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1385,16 +1385,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) } // Parse the message and subject - $message = censor_text($row['post_text']); - - // Second parse bbcode here - if ($row['bbcode_bitfield']) - { - $bbcode->bbcode_second_pass($message, $row['bbcode_uid'], $row['bbcode_bitfield']); - } - - $message = bbcode_nl2br($message); - $message = smiley_text($message); + $message = generate_text_for_display($message, $row['bbcode_uid'], $row['bbcode_bitfield'], ($row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES, true); if (!empty($attachments[$row['post_id']])) { |