aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2012-02-18 23:31:31 +0100
committerAndreas Fischer <bantu@phpbb.com>2012-02-18 23:34:22 +0100
commit11c5a6621389af854170d3190432d3f414c77618 (patch)
treeea3cf8fc17176fd72081657108bbc8d5e11173bc
parent4b2690f792d330622fd5409ded5f163db1b97bd9 (diff)
downloadforums-11c5a6621389af854170d3190432d3f414c77618.tar
forums-11c5a6621389af854170d3190432d3f414c77618.tar.gz
forums-11c5a6621389af854170d3190432d3f414c77618.tar.bz2
forums-11c5a6621389af854170d3190432d3f414c77618.tar.xz
forums-11c5a6621389af854170d3190432d3f414c77618.zip
[ticket/10658] Use get_user_rank() for group ranks on group view.
The old code was buggy because it did not prefix the path with the phpBB root path which causes problems with bridges and other URL rewriting. PHPBB3-10658
-rw-r--r--phpBB/memberlist.php15
1 files changed, 5 insertions, 10 deletions
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index b3c0bae16a..cfa1631dbe 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -1221,21 +1221,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(