diff options
| author | 3Di <three3di@hotmail.it> | 2018-12-24 09:42:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-24 09:42:16 +0100 |
| commit | 871875d9aa3d0b0a17a0eb1936323d5737a438f5 (patch) | |
| tree | d035cb1e7c7d99fedd70976c47cf9d7d8a04c7ac /phpBB/memberlist.php | |
| parent | db7f4d4c9523e5dc36c62ec6fe647aaf7708daaa (diff) | |
| parent | ca98cd413a6f01eb01e3ca60cea9b55409dadc61 (diff) | |
| download | forums-871875d9aa3d0b0a17a0eb1936323d5737a438f5.tar forums-871875d9aa3d0b0a17a0eb1936323d5737a438f5.tar.gz forums-871875d9aa3d0b0a17a0eb1936323d5737a438f5.tar.bz2 forums-871875d9aa3d0b0a17a0eb1936323d5737a438f5.tar.xz forums-871875d9aa3d0b0a17a0eb1936323d5737a438f5.zip | |
Merge pull request #1 from phpbb/3.2.x
3.2.x
Diffstat (limited to 'phpBB/memberlist.php')
| -rw-r--r-- | phpBB/memberlist.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 977857da59..d0dd70af01 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', ); |