diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-01-24 03:05:32 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-01-24 03:05:32 +0000 |
| commit | c73e80888afa0b30a464c5500f22b865a122dd55 (patch) | |
| tree | 9bee7fda0be9708d10a3b3e5f51ba0e206c45f9c /phpBB/viewtopic.php | |
| parent | 12863932df7cb0a95d26ddb4b2c6ad1eece4e77a (diff) | |
| download | forums-c73e80888afa0b30a464c5500f22b865a122dd55.tar forums-c73e80888afa0b30a464c5500f22b865a122dd55.tar.gz forums-c73e80888afa0b30a464c5500f22b865a122dd55.tar.bz2 forums-c73e80888afa0b30a464c5500f22b865a122dd55.tar.xz forums-c73e80888afa0b30a464c5500f22b865a122dd55.zip | |
Fix admin disable avatar yet still shows bug #506070
git-svn-id: file:///svn/phpbb/trunk@1930 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 49b422d077..61161c0da5 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -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_avatar = ""; if( $postrow[$i]['user_avatar_type'] && $poster_id != ANONYMOUS && $postrow[$i]['user_allowavatar'] ) { switch( $postrow[$i]['user_avatar_type'] ) { 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; 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; 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; } } - else - { - $poster_avatar = ""; - } // // Define the little post icon |