From b63745fdb3b775d7505f38ed03a8bb39907a825c Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Thu, 12 Apr 2007 16:20:39 +0000
Subject: my take on getting the bugs down... thanks to those also providing
 (usable) solutions to the problem. ;) Of course also to those reporting
 generally...

git-svn-id: file:///svn/phpbb/trunk@7330 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/mcp/mcp_warn.php | 48 +++++++++--------------------------------
 1 file changed, 10 insertions(+), 38 deletions(-)

(limited to 'phpBB/includes/mcp/mcp_warn.php')

diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php
index ea414d2bfd..6d3961de2f 100755
--- a/phpBB/includes/mcp/mcp_warn.php
+++ b/phpBB/includes/mcp/mcp_warn.php
@@ -272,28 +272,14 @@ function mcp_warn_post_view($id, $mode, $action)
 	$message = smiley_text($message);
 
 	// Generate the appropriate user information for the user we are looking at
-	$rank_title = $rank_img = '';
-//	get_user_rank($user_row['user_rank'], $user_row['user_posts'], $rank_title, $rank_img);
-
-	$avatar_img = '';
-
-	if (!empty($user_row['user_avatar']))
+	if (!function_exists('get_user_avatar'))
 	{
-		switch ($user_row['user_avatar_type'])
-		{
-			case AVATAR_UPLOAD:
-				$avatar_img = $config['avatar_path'] . '/';
-			break;
-
-			case AVATAR_GALLERY:
-				$avatar_img = $config['avatar_gallery_path'] . '/';
-			break;
-		}
-
-		$avatar_img .= $user_row['user_avatar'];
-		$avatar_img = '<img src="' . $avatar_img . '" width="' . $user_row['user_avatar_width'] . '" height="' . $user_row['user_avatar_height'] . '" alt="" />';
+		include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
 	}
 
+	$rank_title = $rank_img = '';
+	$avatar_img = get_user_avatar($user_row['user_avatar'], $user_row['user_avatar_type'], $user_row['user_avatar_width'], $user_row['user_avatar_height']);
+
 	$template->assign_vars(array(
 		'U_POST_ACTION'		=> append_sid("{$phpbb_root_path}mcp.$phpEx", "i=$id&amp;mode=$mode&amp;p=$post_id"),
 
@@ -357,28 +343,14 @@ function mcp_warn_user_view($id, $mode, $action)
 	}
 
 	// Generate the appropriate user information for the user we are looking at
-	$rank_title = $rank_img = '';
-//	get_user_rank($user_row['user_rank'], $user_row['user_posts'], $rank_title, $rank_img);
-
-	$avatar_img = '';
-
-	if (!empty($user_row['user_avatar']))
+	if (!function_exists('get_user_avatar'))
 	{
-		switch ($user_row['user_avatar_type'])
-		{
-			case AVATAR_UPLOAD:
-				$avatar_img = $config['avatar_path'] . '/';
-			break;
-
-			case AVATAR_GALLERY:
-				$avatar_img = $config['avatar_gallery_path'] . '/';
-			break;
-		}
-
-		$avatar_img .= $user_row['user_avatar'];
-		$avatar_img = '<img src="' . $avatar_img . '" width="' . $user_row['user_avatar_width'] . '" height="' . $user_row['user_avatar_height'] . '" alt="" />';
+		include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
 	}
 
+	$rank_title = $rank_img = '';
+	$avatar_img = get_user_avatar($user_row['user_avatar'], $user_row['user_avatar_type'], $user_row['user_avatar_width'], $user_row['user_avatar_height']);
+
 	// OK, they didn't submit a warning so lets build the page for them to do so
 	$template->assign_vars(array(
 		'U_POST_ACTION'		=> append_sid("{$phpbb_root_path}mcp.$phpEx", "i=$id&amp;mode=$mode&amp;u=$user_id"),
-- 
cgit v1.2.1