diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-06-17 11:28:21 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-06-17 11:28:21 +0000 |
| commit | 10846d462ac9aa4790157f02e6cbf76297c29b82 (patch) | |
| tree | bafc6eb7aac2f104cfa055163b2def8b65887ac6 /phpBB/memberlist.php | |
| parent | f04a3349e66984506ab71f0506d718188022e03f (diff) | |
| download | forums-10846d462ac9aa4790157f02e6cbf76297c29b82.tar forums-10846d462ac9aa4790157f02e6cbf76297c29b82.tar.gz forums-10846d462ac9aa4790157f02e6cbf76297c29b82.tar.bz2 forums-10846d462ac9aa4790157f02e6cbf76297c29b82.tar.xz forums-10846d462ac9aa4790157f02e6cbf76297c29b82.zip | |
fix bugs #2271 and #2273
git-svn-id: file:///svn/phpbb/trunk@6081 89ea8834-ac86-4346-8a33-228a782c2dd0
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 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 |