diff options
| author | brunoais <brunoaiss@gmail.com> | 2013-08-04 12:06:26 +0100 |
|---|---|---|
| committer | brunoais <brunoaiss@gmail.com> | 2013-08-04 12:06:26 +0100 |
| commit | 520027c8b7975e22efd2f687dc14587a01332103 (patch) | |
| tree | 4b8f3b4154008eb69839fab4fab3e09f903c4226 /phpBB/search.php | |
| parent | b5651c0289054f2f4453806200506968241f9a82 (diff) | |
| download | forums-520027c8b7975e22efd2f687dc14587a01332103.tar forums-520027c8b7975e22efd2f687dc14587a01332103.tar.gz forums-520027c8b7975e22efd2f687dc14587a01332103.tar.bz2 forums-520027c8b7975e22efd2f687dc14587a01332103.tar.xz forums-520027c8b7975e22efd2f687dc14587a01332103.zip | |
[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
Diffstat (limited to 'phpBB/search.php')
| -rw-r--r-- | phpBB/search.php | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/phpBB/search.php b/phpBB/search.php index 7d20d8d4a2..d0c9df9451 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -962,14 +962,8 @@ if ($keywords || $author || $author_id || $search_id || $submit) } else { - // Second parse bbcode here - if ($row['bbcode_bitfield']) - { - $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']); + $parse_flags = ($row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES; + $row['post_text'] = generate_text_for_display($row['post_text'], $row['bbcode_uid'], $row['bbcode_bitfield'], $parse_flags, false); if (!empty($attachments[$row['post_id']])) { |