mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-07 20:08:53 +00:00
Merge branch '3.3.x'
This commit is contained in:
commit
480016f600
1 changed files with 2 additions and 1 deletions
|
@ -720,6 +720,8 @@ if ($keywords || $author || $author_id || $search_id || $submit)
|
|||
|
||||
if ($sql_where)
|
||||
{
|
||||
$zebra = [];
|
||||
|
||||
if ($show_results == 'posts')
|
||||
{
|
||||
// @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'];
|
||||
$result = $db->sql_query($sql);
|
||||
|
||||
$zebra = array();
|
||||
while ($row = $db->sql_fetchrow($result))
|
||||
{
|
||||
$zebra[($row['friend']) ? 'friend' : 'foe'][] = $row['zebra_id'];
|
||||
|
|
Loading…
Add table
Reference in a new issue