mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-29 02:59:52 +02:00
Code Issues Releases Wiki Activity

fix bugs #2271 and #2273

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@6081 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2006-06-17 11:28:21 +00:00
parent f04a3349e6
commit 10846d462a
8 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/memberlist.php
View File

@@ -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