diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-04-12 16:20:39 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-04-12 16:20:39 +0000 |
| commit | b63745fdb3b775d7505f38ed03a8bb39907a825c (patch) | |
| tree | 3c2bc96535a30d66df3fdf6b3307be469d4362bd /phpBB/viewtopic.php | |
| parent | f0868d37dfd73df6c2dfd76362af6c09b6b49a5f (diff) | |
| download | forums-b63745fdb3b775d7505f38ed03a8bb39907a825c.tar forums-b63745fdb3b775d7505f38ed03a8bb39907a825c.tar.gz forums-b63745fdb3b775d7505f38ed03a8bb39907a825c.tar.bz2 forums-b63745fdb3b775d7505f38ed03a8bb39907a825c.tar.xz forums-b63745fdb3b775d7505f38ed03a8bb39907a825c.zip | |
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
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 214bc938e1..48ae70c7d6 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1021,7 +1021,7 @@ while ($row = $db->sql_fetchrow($result)) 'viewonline' => $row['user_allow_viewonline'], 'allow_pm' => $row['user_allow_pm'], - 'avatar' => '', + 'avatar' => ($user->optionget('viewavatars')) ? get_user_avatar($row['user_avatar'], $row['user_avatar_type'], $row['user_avatar_width'], $row['user_avatar_height']) : '', 'age' => '', 'rank_title' => '', @@ -1041,25 +1041,6 @@ while ($row = $db->sql_fetchrow($result)) 'search' => ($auth->acl_get('u_search')) ? append_sid("{$phpbb_root_path}search.$phpEx", 'search_author=' . urlencode($row['username']) .'&showresults=posts') : '', ); - if ($row['user_avatar'] && $user->optionget('viewavatars')) - { - $avatar_img = ''; - - switch ($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 .= $row['user_avatar']; - $user_cache[$poster_id]['avatar'] = '<img src="' . $avatar_img . '" width="' . $row['user_avatar_width'] . '" height="' . $row['user_avatar_height'] . '" alt="" />'; - } - get_user_rank($row['user_rank'], $row['user_posts'], $user_cache[$poster_id]['rank_title'], $user_cache[$poster_id]['rank_image'], $user_cache[$poster_id]['rank_image_src']); if (!empty($row['user_allow_viewemail']) || $auth->acl_get('a_email')) |