makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/9549] Fix displaying empty groups

Browse source 
PHPBB3-9549
This commit is contained in:
Joas Schilling 2011-02-24 02:05:03 +01:00
parent 6e9aecec79
commit e5b1cfe93b
1 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
phpBB/memberlist.php
View file

@ -212,13 +212,18 @@ switch ($mode)
foreach ($groups_ary as $group_id => $group_data) foreach ($groups_ary as $group_id => $group_data)
{ {
if (!empty($group_users[$group_id])) if ($group_data['group_teampage'])
{ {
$template->assign_block_vars('group', array( $template->assign_block_vars('group', array(
'GROUP_NAME' => $group_data['group_name'], 'GROUP_NAME' => $group_data['group_name'],
'GROUP_COLOR' => $group_data['group_colour'], 'GROUP_COLOR' => $group_data['group_colour'],
'U_GROUP' => $group_data['u_group'], 'U_GROUP' => $group_data['u_group'],
)); ));
}
// Display group members.
if (!empty($group_users[$group_id]))
{
foreach ($group_users[$group_id] as $user_id) foreach ($group_users[$group_id] as $user_id)
{ {
if (isset($user_ary[$user_id])) if (isset($user_ary[$user_id]))
@ -229,24 +234,24 @@ switch ($mode)
get_user_rank($row['user_rank'], (($row['user_id'] == ANONYMOUS) ? false : $row['user_posts']), $rank_title, $rank_img, $rank_img_src); get_user_rank($row['user_rank'], (($row['user_id'] == ANONYMOUS) ? false : $row['user_posts']), $rank_title, $rank_img, $rank_img_src);
$template->assign_block_vars('group.user', array( $template->assign_block_vars('group.user', array(
'USER_ID' => $row['user_id'], 'USER_ID' => $row['user_id'],
'FORUMS' => $row['forums'], 'FORUMS' => $row['forums'],
'FORUM_OPTIONS' => (isset($row['forums_options'])) ? true : false, 'FORUM_OPTIONS' => (isset($row['forums_options'])) ? true : false,
'RANK_TITLE' => $rank_title, 'RANK_TITLE' => $rank_title,
'GROUP_NAME' => $groups_ary[$row['default_group']]['group_name'], 'GROUP_NAME' => $groups_ary[$row['default_group']]['group_name'],
'GROUP_COLOR' => $groups_ary[$row['default_group']]['group_colour'], 'GROUP_COLOR' => $groups_ary[$row['default_group']]['group_colour'],
'U_GROUP' => $groups_ary[$row['default_group']]['u_group'], 'U_GROUP' => $groups_ary[$row['default_group']]['u_group'],
'RANK_IMG' => $rank_img, 'RANK_IMG' => $rank_img,
'RANK_IMG_SRC' => $rank_img_src, 'RANK_IMG_SRC' => $rank_img_src,
'U_PM' => ($config['allow_privmsg'] && $auth->acl_get('u_sendpm') && ($row['user_allow_pm'] || $auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_'))) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=compose&u=' . $row['user_id']) : '', 'U_PM' => ($config['allow_privmsg'] && $auth->acl_get('u_sendpm') && ($row['user_allow_pm'] || $auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_'))) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=compose&u=' . $row['user_id']) : '',
'USERNAME_FULL' => get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']), 'USERNAME_FULL' => get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']),
'USERNAME' => get_username_string('username', $row['user_id'], $row['username'], $row['user_colour']), 'USERNAME' => get_username_string('username', $row['user_id'], $row['username'], $row['user_colour']),
'USER_COLOR' => get_username_string('colour', $row['user_id'], $row['username'], $row['user_colour']), 'USER_COLOR' => get_username_string('colour', $row['user_id'], $row['username'], $row['user_colour']),
'U_VIEW_PROFILE' => get_username_string('profile', $row['user_id'], $row['username'], $row['user_colour']), 'U_VIEW_PROFILE' => get_username_string('profile', $row['user_id'], $row['username'], $row['user_colour']),
)); ));
if (!$config['teampage_multiple']) if (!$config['teampage_multiple'])