From c73e80888afa0b30a464c5500f22b865a122dd55 Mon Sep 17 00:00:00 2001
From: "Paul S. Owen" <psotfx@users.sourceforge.net>
Date: Thu, 24 Jan 2002 03:05:32 +0000
Subject: Fix admin disable avatar yet still shows bug #506070

git-svn-id: file:///svn/phpbb/trunk@1930 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/profile.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'phpBB/profile.php')

diff --git a/phpBB/profile.php b/phpBB/profile.php
index 8d45648d9a..1c819e9632 100644
--- a/phpBB/profile.php
+++ b/phpBB/profile.php
@@ -268,25 +268,22 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
 			$email_img = "";
 		}
 
+		$avatar_img = "";
 		if( $profiledata['user_avatar_type'] && $profiledata['user_allowavatar'] )
 		{
 			switch( $profiledata['user_avatar_type'] )
 			{
 				case USER_AVATAR_UPLOAD:
-					$avatar_img = '<img src="' . $board_config['avatar_path'] . '/' . $profiledata['user_avatar'] . '" alt="" />';
+					$avatar_img = ( $board_config['allow_avatar_upload'] ) ? '<img src="' . $board_config['avatar_path'] . "/" . $profiledata['user_avatar'] . '" alt="" border="0" />' : '';
 					break;
 				case USER_AVATAR_REMOTE:
-					$avatar_img = '<img src="' . $profiledata['user_avatar'] . '" alt="" />';
+					$avatar_img = ( $board_config['allow_avatar_remote'] ) ? '<img src="' . $profiledata['user_avatar'] . '" alt="" border="0" />' : '';
 					break;
 				case USER_AVATAR_GALLERY:
-					$avatar_img = '<img src="' . $board_config['avatar_gallery_path'] . '/' . $profiledata['user_avatar'] . '" alt="" />';
+					$avatar_img = ( $board_config['allow_avatar_local'] ) ? '<img src="' . $board_config['avatar_gallery_path'] . '/' . $profiledata['user_avatar'] . '" alt="" border="0" />' : '';
 					break;
 			}
 		}
-		else
-		{
-			$avatar_img = "";
-		}
 
 		$poster_rank = "";
 		$rank_image = "";
-- 
cgit v1.2.1