mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-01 22:40:39 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.2.x'

Browse Source
This commit is contained in:
Marc Alexander
2018-11-27 22:03:40 +01:00
parent b851e708bb 7182f5d88f
commit 6ff0275332
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/memberlist.php
View File

@@ -173,7 +173,7 @@ switch ($mode)
'LEFT_JOIN' => array( 'LEFT_JOIN' => array(
array( array(
'FROM' => array(USERS_TABLE => 'u'), '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( array(
'FROM' => array(GROUPS_TABLE => 'g'), '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', 'ORDER_BY' => 'u.username_clean ASC',
); );