mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 05:50:42 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x'

Browse Source
This commit is contained in:
Marc Alexander
2015-02-18 18:04:46 +01:00
parent 21c6223eb3 098854a822
commit 5ad4685f00
6 changed files with 3 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
phpBB/search.php
View File

@@ -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))
{