1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-17 23:21:33 +02:00

[ticket/11637] generate_text_for_display on search.php

sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11639
This commit is contained in:
brunoais
2013-08-04 12:06:26 +01:00
parent b5651c0289
commit 520027c8b7

View File

@@ -962,14 +962,8 @@ if ($keywords || $author || $author_id || $search_id || $submit)
} }
else else
{ {
// Second parse bbcode here $parse_flags = ($row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES;
if ($row['bbcode_bitfield']) $row['post_text'] = generate_text_for_display($row['post_text'], $row['bbcode_uid'], $row['bbcode_bitfield'], $parse_flags, false);
{
$bbcode->bbcode_second_pass($row['post_text'], $row['bbcode_uid'], $row['bbcode_bitfield']);
}
$row['post_text'] = bbcode_nl2br($row['post_text']);
$row['post_text'] = smiley_text($row['post_text']);
if (!empty($attachments[$row['post_id']])) if (!empty($attachments[$row['post_id']]))
{ {