diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-04-03 20:57:31 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-04-03 20:57:31 -0400 |
| commit | 714fafe106a1b30d299f2e29588c0d73d6ec44b5 (patch) | |
| tree | e2077435872f0748c19ca1dd802f350873a6bd17 | |
| parent | add130fa3a0ee5d2037aa7f10bea5bbef8f2824a (diff) | |
| parent | 14e727b8345e7933662a2b363736866966996839 (diff) | |
| download | forums-714fafe106a1b30d299f2e29588c0d73d6ec44b5.tar forums-714fafe106a1b30d299f2e29588c0d73d6ec44b5.tar.gz forums-714fafe106a1b30d299f2e29588c0d73d6ec44b5.tar.bz2 forums-714fafe106a1b30d299f2e29588c0d73d6ec44b5.tar.xz forums-714fafe106a1b30d299f2e29588c0d73d6ec44b5.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10658] Do not fetch ranks into the $ranks array, it is no longer used.
[ticket/10658] Use get_user_rank() for group ranks on group view.
| -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( |