diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2018-11-27 22:03:36 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2018-11-27 22:03:36 +0100 |
| commit | 7182f5d88fee77f066619303be80203016528314 (patch) | |
| tree | 8c5fca198655661b58dde20eba55c65450276994 /phpBB | |
| parent | db7f4d4c9523e5dc36c62ec6fe647aaf7708daaa (diff) | |
| parent | 9e375f32eb4d2eea65ba6fc929c82c65c6ab2d61 (diff) | |
| download | forums-7182f5d88fee77f066619303be80203016528314.tar forums-7182f5d88fee77f066619303be80203016528314.tar.gz forums-7182f5d88fee77f066619303be80203016528314.tar.bz2 forums-7182f5d88fee77f066619303be80203016528314.tar.xz forums-7182f5d88fee77f066619303be80203016528314.zip | |
Merge pull request #5427 from dark-1/ticket/15858
[ticket/15858] Unapproved User(s) appearing as Guest in Team Page
Diffstat (limited to 'phpBB')
| -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', ); |