diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-12 19:30:43 -0700 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-12 19:30:43 -0700 |
| commit | a7ea874c0d9956e46a6e7a1595a7cfa7f5b931c7 (patch) | |
| tree | 161a5357d9d0c5cdeef1a8c2e72e99819933ea25 /phpBB/search.php | |
| parent | 94b3d3839218135ddc6a24c432b4459943222bcb (diff) | |
| parent | 520027c8b7975e22efd2f687dc14587a01332103 (diff) | |
| download | forums-a7ea874c0d9956e46a6e7a1595a7cfa7f5b931c7.tar forums-a7ea874c0d9956e46a6e7a1595a7cfa7f5b931c7.tar.gz forums-a7ea874c0d9956e46a6e7a1595a7cfa7f5b931c7.tar.bz2 forums-a7ea874c0d9956e46a6e7a1595a7cfa7f5b931c7.tar.xz forums-a7ea874c0d9956e46a6e7a1595a7cfa7f5b931c7.zip | |
Merge pull request #1640 from brunoais/ticket/11637
[ticket/11637] generate_text_for_display on search.php
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 40c0b9a8ce..784e1f6398 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -964,14 +964,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']])) { |