[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
This commit is contained in:
Bruno Ais 2013-07-13 14:35:50 +01:00
parent a58ccdabf3
commit 713a2ba573

View file

@ -1385,16 +1385,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
} }
// Parse the message and subject // Parse the message and subject
$message = censor_text($row['post_text']); $message = generate_text_for_display($message, $row['bbcode_uid'], $row['bbcode_bitfield'], ($row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES, true);
// 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);
if (!empty($attachments[$row['post_id']])) if (!empty($attachments[$row['post_id']]))
{ {