diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2011-02-24 02:05:03 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2011-02-24 02:05:03 +0100 |
| commit | e5b1cfe93b105d6d29719777df1d2dcaa307059a (patch) | |
| tree | 6ec2e338a45dece7879eb0b2fdbd14f0eaacdc64 | |
| parent | 6e9aecec796d9aeacd82c5da2c56103f729f29a4 (diff) | |
| download | forums-e5b1cfe93b105d6d29719777df1d2dcaa307059a.tar forums-e5b1cfe93b105d6d29719777df1d2dcaa307059a.tar.gz forums-e5b1cfe93b105d6d29719777df1d2dcaa307059a.tar.bz2 forums-e5b1cfe93b105d6d29719777df1d2dcaa307059a.tar.xz forums-e5b1cfe93b105d6d29719777df1d2dcaa307059a.zip | |
[ticket/9549] Fix displaying empty groups
PHPBB3-9549
| -rw-r--r-- | phpBB/memberlist.php | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 41b440ccf9..f417215dab 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -212,13 +212,18 @@ switch ($mode) 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( 'GROUP_NAME' => $group_data['group_name'], 'GROUP_COLOR' => $group_data['group_colour'], 'U_GROUP' => $group_data['u_group'], )); + } + + // Display group members. + if (!empty($group_users[$group_id])) + { foreach ($group_users[$group_id] as $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); $template->assign_block_vars('group.user', array( - 'USER_ID' => $row['user_id'], - 'FORUMS' => $row['forums'], - 'FORUM_OPTIONS' => (isset($row['forums_options'])) ? true : false, - 'RANK_TITLE' => $rank_title, + 'USER_ID' => $row['user_id'], + 'FORUMS' => $row['forums'], + 'FORUM_OPTIONS' => (isset($row['forums_options'])) ? true : false, + 'RANK_TITLE' => $rank_title, - 'GROUP_NAME' => $groups_ary[$row['default_group']]['group_name'], - 'GROUP_COLOR' => $groups_ary[$row['default_group']]['group_colour'], - 'U_GROUP' => $groups_ary[$row['default_group']]['u_group'], + 'GROUP_NAME' => $groups_ary[$row['default_group']]['group_name'], + 'GROUP_COLOR' => $groups_ary[$row['default_group']]['group_colour'], + 'U_GROUP' => $groups_ary[$row['default_group']]['u_group'], - 'RANK_IMG' => $rank_img, - 'RANK_IMG_SRC' => $rank_img_src, + 'RANK_IMG' => $rank_img, + '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' => 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']), - 'U_VIEW_PROFILE' => get_username_string('profile', $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']), + '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']), )); if (!$config['teampage_multiple']) |