From 11c5a6621389af854170d3190432d3f414c77618 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 18 Feb 2012 23:31:31 +0100
Subject: [PATCH 1/2] [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
---
 phpBB/memberlist.php | 15 +++++----------
 1 file 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(

From bb7e86c2b1920c5820d4c9cca7ec76bd25835fa1 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 8 Mar 2012 15:19:15 +0100
Subject: [PATCH 2/2] [ticket/10658] Do not fetch ranks into the $ranks array,
 it is no longer used.

PHPBB3-10658
---
 phpBB/memberlist.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index cfa1631dbe..3dd5bd24b6 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -62,11 +62,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)
 {