[Phpbb-checkins] CVS: phpBB2 profile.php,1.169,1.170 viewtopic.php,1.164,1.165

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv14716

Modified Files:
	profile.php viewtopic.php 
Log Message:
Fix admin disable avatar yet still shows bug #506070

Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.169
retrieving revision 1.170
diff -C2 -r1.169 -r1.170
*** profile.php	2002/01/24 02:46:15	1.169
--- profile.php	2002/01/24 03:05:32	1.170
***************
*** 269,272 ****
--- 269,273 ----
  		}
  
+ 		$avatar_img = "";
  		if( $profiledata['user_avatar_type'] && $profiledata['user_allowavatar'] )
  		{
***************
*** 274,290 ****
  			{
  				case USER_AVATAR_UPLOAD:
! 					$avatar_img = '<img src="' . $board_config['avatar_path'] . '/' . $profiledata['user_avatar'] . '" alt="" />';
  					break;
  				case USER_AVATAR_REMOTE:
! 					$avatar_img = '<img src="' . $profiledata['user_avatar'] . '" alt="" />';
  					break;
  				case USER_AVATAR_GALLERY:
! 					$avatar_img = '<img src="' . $board_config['avatar_gallery_path'] . '/' . $profiledata['user_avatar'] . '" alt="" />';
  					break;
  			}
- 		}
- 		else
- 		{
- 			$avatar_img = "";
  		}
  
--- 275,287 ----
  			{
  				case USER_AVATAR_UPLOAD:
! 					$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 = ( $board_config['allow_avatar_remote'] ) ? '<img src="' . $profiledata['user_avatar'] . '" alt="" border="0" />' : '';
  					break;
  				case USER_AVATAR_GALLERY:
! 					$avatar_img = ( $board_config['allow_avatar_local'] ) ? '<img src="' . $board_config['avatar_gallery_path'] . '/' . $profiledata['user_avatar'] . '" alt="" border="0" />' : '';
  					break;
  			}
  		}
  

Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.164
retrieving revision 1.165
diff -C2 -r1.164 -r1.165
*** viewtopic.php	2002/01/16 21:29:06	1.164
--- viewtopic.php	2002/01/24 03:05:32	1.165
***************
*** 817,820 ****
--- 817,821 ----
  	$poster_joined = ( $postrow[$i]['user_id'] != ANONYMOUS ) ? $lang['Joined'] . ": " . create_date($lang['DATE_FORMAT'], $postrow[$i]['user_regdate'], $board_config['board_timezone']) : "";
  
+ 	$poster_avatar = "";
  	if( $postrow[$i]['user_avatar_type'] && $poster_id != ANONYMOUS && $postrow[$i]['user_allowavatar'] )
  	{
***************
*** 822,838 ****
  		{
  			case USER_AVATAR_UPLOAD:
! 				$poster_avatar = '<img src="' . $board_config['avatar_path'] . "/" . $postrow[$i]['user_avatar'] . '" alt="" border="0" />';
  				break;
  			case USER_AVATAR_REMOTE:
! 				$poster_avatar = '<img src="' . $postrow[$i]['user_avatar'] . "\" alt=\"\" border=\"0\" />";
  				break;
  			case USER_AVATAR_GALLERY:
! 				$poster_avatar = '<img src="' . $board_config['avatar_gallery_path'] . "/" . $postrow[$i]['user_avatar'] . '" alt="" border="0" />';
  				break;
  		}
- 	}
- 	else
- 	{
- 		$poster_avatar = "";
  	}
  
--- 823,835 ----
  		{
  			case USER_AVATAR_UPLOAD:
! 				$poster_avatar = ( $board_config['allow_avatar_upload'] ) ? '<img src="' . $board_config['avatar_path'] . "/" . $postrow[$i]['user_avatar'] . '" alt="" border="0" />' : '';
  				break;
  			case USER_AVATAR_REMOTE:
! 				$poster_avatar = ( $board_config['allow_avatar_remote'] ) ? '<img src="' . $postrow[$i]['user_avatar'] . '" alt="" border="0" />' : '';
  				break;
  			case USER_AVATAR_GALLERY:
! 				$poster_avatar = ( $board_config['allow_avatar_local'] ) ? '<img src="' . $board_config['avatar_gallery_path'] . "/" . $postrow[$i]['user_avatar'] . '" alt="" border="0" />' : '';
  				break;
  		}
  	}