makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 22:08:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.3.x'

Browse source
This commit is contained in:
Marc Alexander 2019-11-17 16:56:47 +01:00
commit 480016f600
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
phpBB/search.php
View file

@ -720,6 +720,8 @@ if ($keywords || $author || $author_id || $search_id || $submit)
if ($sql_where) if ($sql_where)
{ {
$zebra = [];
if ($show_results == 'posts') if ($show_results == 'posts')
{ {
// @todo Joining this query to the one below? // @todo Joining this query to the one below?
@ -728,7 +730,6 @@ if ($keywords || $author || $author_id || $search_id || $submit)
WHERE user_id = ' . $user->data['user_id']; WHERE user_id = ' . $user->data['user_id'];
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$zebra = array();
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{ {
$zebra[($row['friend']) ? 'friend' : 'foe'][] = $row['zebra_id']; $zebra[($row['friend']) ? 'friend' : 'foe'][] = $row['zebra_id'];