mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 14:18:52 +00:00
Fix admin disable avatar yet still shows bug #506070
git-svn-id: file:///svn/phpbb/trunk@1930 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
12863932df
commit
c73e80888a
2 changed files with 8 additions and 14 deletions
|
@ -268,25 +268,22 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
|
||||||
$email_img = "";
|
$email_img = "";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$avatar_img = "";
|
||||||
if( $profiledata['user_avatar_type'] && $profiledata['user_allowavatar'] )
|
if( $profiledata['user_avatar_type'] && $profiledata['user_allowavatar'] )
|
||||||
{
|
{
|
||||||
switch( $profiledata['user_avatar_type'] )
|
switch( $profiledata['user_avatar_type'] )
|
||||||
{
|
{
|
||||||
case USER_AVATAR_UPLOAD:
|
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;
|
break;
|
||||||
case USER_AVATAR_REMOTE:
|
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;
|
break;
|
||||||
case USER_AVATAR_GALLERY:
|
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;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
$avatar_img = "";
|
|
||||||
}
|
|
||||||
|
|
||||||
$poster_rank = "";
|
$poster_rank = "";
|
||||||
$rank_image = "";
|
$rank_image = "";
|
||||||
|
|
|
@ -816,25 +816,22 @@ for($i = 0; $i < $total_posts; $i++)
|
||||||
|
|
||||||
$poster_joined = ( $postrow[$i]['user_id'] != ANONYMOUS ) ? $lang['Joined'] . ": " . create_date($lang['DATE_FORMAT'], $postrow[$i]['user_regdate'], $board_config['board_timezone']) : "";
|
$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'] )
|
if( $postrow[$i]['user_avatar_type'] && $poster_id != ANONYMOUS && $postrow[$i]['user_allowavatar'] )
|
||||||
{
|
{
|
||||||
switch( $postrow[$i]['user_avatar_type'] )
|
switch( $postrow[$i]['user_avatar_type'] )
|
||||||
{
|
{
|
||||||
case USER_AVATAR_UPLOAD:
|
case USER_AVATAR_UPLOAD:
|
||||||
$poster_avatar = '<img src="' . $board_config['avatar_path'] . "/" . $postrow[$i]['user_avatar'] . '" alt="" border="0" />';
|
$poster_avatar = ( $board_config['allow_avatar_upload'] ) ? '<img src="' . $board_config['avatar_path'] . "/" . $postrow[$i]['user_avatar'] . '" alt="" border="0" />' : '';
|
||||||
break;
|
break;
|
||||||
case USER_AVATAR_REMOTE:
|
case USER_AVATAR_REMOTE:
|
||||||
$poster_avatar = '<img src="' . $postrow[$i]['user_avatar'] . "\" alt=\"\" border=\"0\" />";
|
$poster_avatar = ( $board_config['allow_avatar_remote'] ) ? '<img src="' . $postrow[$i]['user_avatar'] . '" alt="" border="0" />' : '';
|
||||||
break;
|
break;
|
||||||
case USER_AVATAR_GALLERY:
|
case USER_AVATAR_GALLERY:
|
||||||
$poster_avatar = '<img src="' . $board_config['avatar_gallery_path'] . "/" . $postrow[$i]['user_avatar'] . '" alt="" border="0" />';
|
$poster_avatar = ( $board_config['allow_avatar_local'] ) ? '<img src="' . $board_config['avatar_gallery_path'] . "/" . $postrow[$i]['user_avatar'] . '" alt="" border="0" />' : '';
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
$poster_avatar = "";
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// Define the little post icon
|
// Define the little post icon
|
||||||
|
|
Loading…
Add table
Reference in a new issue