From 46c9da77a47abba5f0bb314d9a4cd68d1abb32c9 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Tue, 2 Jan 2007 16:35:48 +0000
Subject: - do not allow setting the parent to currently assigned childs [Bug
 #6708] - Allow the display_on_index setting to be specified for link forums
 [Bug #6660] - Rank code in functions_display.php [Bug #6656] - Added some new
 locations for the viewonline page [Related to bug #6484] - Do not display
 attached images inline if user disabled image display in posts; the same with
 flash files [Bug #6226]

git-svn-id: file:///svn/phpbb/trunk@6829 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/viewtopic.php | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

(limited to 'phpBB/viewtopic.php')

diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index ee15a89d7a..1f1c1acb6a 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -1050,28 +1050,7 @@ while ($row = $db->sql_fetchrow($result))
 				$user_cache[$poster_id]['avatar'] = '<img src="' . $avatar_img . '" width="' . $row['user_avatar_width'] . '" height="' . $row['user_avatar_height'] . '" alt="" />';
 			}
 
-			if (!empty($row['user_rank']))
-			{
-				$user_cache[$poster_id]['rank_title'] = (isset($ranks['special'][$row['user_rank']])) ? $ranks['special'][$row['user_rank']]['rank_title'] : '';
-				$user_cache[$poster_id]['rank_image'] = (!empty($ranks['special'][$row['user_rank']]['rank_image'])) ? '<img src="' . $config['ranks_path'] . '/' . $ranks['special'][$row['user_rank']]['rank_image'] . '" alt="' . $ranks['special'][$row['user_rank']]['rank_title'] . '" title="' . $ranks['special'][$row['user_rank']]['rank_title'] . '" /><br />' : '';
-				$user_cache[$poster_id]['rank_image_src'] = (!empty($ranks['special'][$row['user_rank']]['rank_image'])) ? $config['ranks_path'] . '/' . $ranks['special'][$row['user_rank']]['rank_image'] : '';
-			}
-			else
-			{
-				if (isset($ranks['normal']) && sizeof($ranks['normal']))
-				{
-					foreach ($ranks['normal'] as $rank)
-					{
-						if ($row['user_posts'] >= $rank['rank_min'])
-						{
-							$user_cache[$poster_id]['rank_title'] = $rank['rank_title'];
-							$user_cache[$poster_id]['rank_image'] = (!empty($rank['rank_image'])) ? '<img src="' . $config['ranks_path'] . '/' . $rank['rank_image'] . '" alt="' . $rank['rank_title'] . '" title="' . $rank['rank_title'] . '" /><br />' : '';
-							$user_cache[$poster_id]['rank_image_src'] = (!empty($rank['rank_image'])) ? $config['ranks_path'] . '/' . $rank['rank_image'] : '';
-							break;
-						}
-					}
-				}
-			}
+			get_user_rank($row['user_rank'], $row['user_posts'], $user_cache[$poster_id]['rank_title'], $user_cache[$poster_id]['rank_image'], $user_cache[$poster_id]['rank_image_src']);
 
 			if (!empty($row['user_allow_viewemail']) || $auth->acl_get('a_email'))
 			{
-- 
cgit v1.2.1