aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author3D-I <marktravai@gmail.com>2019-01-06 04:14:00 +0100
committer3D-I <marktravai@gmail.com>2019-01-06 04:25:53 +0100
commit89f586e99e6617270e201bda9d38e32618d3db2f (patch)
treed506daeab0f4308274c29f1aac36e0476bd2ff6b /phpBB/memberlist.php
parent[ticket/15889] Use array version of sql_from tables in sql array (diff)
parentMerge pull request #1 from phpbb/3.2.x (diff)
downloadphpbb-89f586e99e6617270e201bda9d38e32618d3db2f.tar.gz
phpbb-89f586e99e6617270e201bda9d38e32618d3db2f.tar.bz2
phpbb-89f586e99e6617270e201bda9d38e32618d3db2f.zip
[ticket/15889] Use array version of sql_from tables in sql array
PHPBB3-15889
Diffstat (limited to 'phpBB/memberlist.php')
-rw-r--r--phpBB/memberlist.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index bcd72762ae..5efb451f55 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -173,7 +173,7 @@ switch ($mode)
'LEFT_JOIN' => array(
array(
'FROM' => array(USERS_TABLE => 'u'),
- 'ON' => 'ug.user_id = u.user_id AND ug.user_pending = 0',
+ 'ON' => 'ug.user_id = u.user_id',
),
array(
'FROM' => array(GROUPS_TABLE => 'g'),
@@ -181,7 +181,7 @@ switch ($mode)
),
),
- 'WHERE' => $db->sql_in_set('g.group_id', $group_ids, false, true),
+ 'WHERE' => $db->sql_in_set('g.group_id', $group_ids, false, true) . ' AND ug.user_pending = 0',
'ORDER_BY' => 'u.username_clean ASC',
);