diff options
| author | Shibu Lijack <shibulijack@gmail.com> | 2012-04-10 21:46:14 +0530 |
|---|---|---|
| committer | Shibu Lijack <shibulijack@gmail.com> | 2012-04-10 21:46:14 +0530 |
| commit | fd55c8664a046258c12e8a207d44340010155627 (patch) | |
| tree | 1a520b8965b88f39cee72e5ce8bb093fb9c38d35 /phpBB/memberlist.php | |
| parent | daee25340381d4b97119be298a9fc2671e681bb3 (diff) | |
| parent | 41e03164c19751624968435f31f1b63367cd4eb2 (diff) | |
| download | forums-fd55c8664a046258c12e8a207d44340010155627.tar forums-fd55c8664a046258c12e8a207d44340010155627.tar.gz forums-fd55c8664a046258c12e8a207d44340010155627.tar.bz2 forums-fd55c8664a046258c12e8a207d44340010155627.tar.xz forums-fd55c8664a046258c12e8a207d44340010155627.zip | |
Merge remote-tracking branch 'upstream/develop' into ticket/10734
Conflicts:
phpBB/styles/prosilver/theme/tweaks.css
Diffstat (limited to 'phpBB/memberlist.php')
| -rw-r--r-- | phpBB/memberlist.php | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 741ac2f430..ed87b6c448 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -61,11 +61,6 @@ $default_key = 'c'; $sort_key = request_var('sk', $default_key); $sort_dir = request_var('sd', 'a'); - -// Grab rank information for later -$ranks = $cache->obtain_ranks(); - - // What do you want to do today? ... oops, I think that line is taken ... switch ($mode) { @@ -1222,21 +1217,16 @@ switch ($mode) // Misusing the avatar function for displaying group avatars... $avatar_img = get_user_avatar($group_row['group_avatar'], $group_row['group_avatar_type'], $group_row['group_avatar_width'], $group_row['group_avatar_height'], 'GROUP_AVATAR'); + // ... same for group rank $rank_title = $rank_img = $rank_img_src = ''; if ($group_row['group_rank']) { - if (isset($ranks['special'][$group_row['group_rank']])) + get_user_rank($group_row['group_rank'], false, $rank_title, $rank_img, $rank_img_src); + + if ($rank_img) { - $rank_title = $ranks['special'][$group_row['group_rank']]['rank_title']; + $rank_img .= '<br />'; } - $rank_img = (!empty($ranks['special'][$group_row['group_rank']]['rank_image'])) ? '<img src="' . $config['ranks_path'] . '/' . $ranks['special'][$group_row['group_rank']]['rank_image'] . '" alt="' . $ranks['special'][$group_row['group_rank']]['rank_title'] . '" title="' . $ranks['special'][$group_row['group_rank']]['rank_title'] . '" /><br />' : ''; - $rank_img_src = (!empty($ranks['special'][$group_row['group_rank']]['rank_image'])) ? $config['ranks_path'] . '/' . $ranks['special'][$group_row['group_rank']]['rank_image'] : ''; - } - else - { - $rank_title = ''; - $rank_img = ''; - $rank_img_src = ''; } $template->assign_vars(array( |