diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-02-18 18:04:46 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-02-18 18:04:46 +0100 |
| commit | 5ad4685f001a1e9f037091bc84727e8af0a0264b (patch) | |
| tree | 9ec2714668c2f62ef93b96bcb2d52ee893ac17a9 /phpBB/search.php | |
| parent | 21c6223eb37e17296a109137a519bf3d1d984981 (diff) | |
| parent | 098854a822846ba3aa222acb95d4028aa5cc830c (diff) | |
| download | forums-5ad4685f001a1e9f037091bc84727e8af0a0264b.tar forums-5ad4685f001a1e9f037091bc84727e8af0a0264b.tar.gz forums-5ad4685f001a1e9f037091bc84727e8af0a0264b.tar.bz2 forums-5ad4685f001a1e9f037091bc84727e8af0a0264b.tar.xz forums-5ad4685f001a1e9f037091bc84727e8af0a0264b.zip | |
Merge branch '3.1.x'
Diffstat (limited to 'phpBB/search.php')
| -rw-r--r-- | phpBB/search.php | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/phpBB/search.php b/phpBB/search.php index bc37beb483..053492fda0 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -800,7 +800,7 @@ if ($keywords || $author || $author_id || $search_id || $submit) } else { - $bbcode_bitfield = $text_only_message = ''; + $text_only_message = ''; $attach_list = array(); while ($row = $db->sql_fetchrow($result)) @@ -820,7 +820,6 @@ if ($keywords || $author || $author_id || $search_id || $submit) if ($return_chars == -1 || utf8_strlen($text_only_message) < ($return_chars + 3)) { $row['display_text_only'] = false; - $bbcode_bitfield = $bbcode_bitfield | base64_decode($row['bbcode_bitfield']); // Does this post have an attachment? If so, add it to the list if ($row['post_attachment'] && $config['allow_attachments']) @@ -840,13 +839,6 @@ if ($keywords || $author || $author_id || $search_id || $submit) unset($text_only_message); - // Instantiate BBCode if needed - if ($bbcode_bitfield !== '') - { - include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx); - $bbcode = new bbcode(base64_encode($bbcode_bitfield)); - } - // Pull attachment data if (sizeof($attach_list)) { |