1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-19 23:32:02 +02:00

Merge pull request #5427 from dark-1/ticket/15858

[ticket/15858] Unapproved User(s) appearing as Guest in Team Page
This commit is contained in:
Marc Alexander 2018-11-27 22:03:36 +01:00
commit 7182f5d88f
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995

View File

@ -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',
);