aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/memberlist.php
diff options
context:
space:
mode:
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 d9c1192868..d7eed90dd2 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -123,7 +123,7 @@ switch ($mode)
'LEFT_JOIN' => array(
array(
'FROM' => array(USER_GROUP_TABLE => 'ug'),
- 'ON' => 'ug.group_id = g.group_id AND ug.user_id = ' . $user->data['user_id']
+ 'ON' => 'ug.group_id = g.group_id AND ug.user_pending = 0 AND ug.user_id = ' . $user->data['user_id']
)
),
@@ -157,7 +157,7 @@ switch ($mode)
if ($row['group_type'] == GROUP_HIDDEN && !$auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel') && $row['ug_user_id'] != $user->data['user_id'])
{
- $group_name = $user->lang['UNDISCLOSED'];
+ $group_name = $user->lang['GROUP_UNDISCLOSED'];
$u_group = '';
}
else