diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-11-26 14:55:18 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-11-26 14:55:18 +0000 |
| commit | 6583f90b8d082096ebd9cfc0588730dd36efb077 (patch) | |
| tree | 36d01de359aafeabe6daa571ea2c0a40da41ab14 /phpBB/viewtopic.php | |
| parent | 5c5330c29d3e19eab804d9dbfd0261e6459e00b8 (diff) | |
| download | forums-6583f90b8d082096ebd9cfc0588730dd36efb077.tar forums-6583f90b8d082096ebd9cfc0588730dd36efb077.tar.gz forums-6583f90b8d082096ebd9cfc0588730dd36efb077.tar.bz2 forums-6583f90b8d082096ebd9cfc0588730dd36efb077.tar.xz forums-6583f90b8d082096ebd9cfc0588730dd36efb077.zip | |
- bug fixes for #5618, #5588 and #5584
- remove messenger->reset() calls (they are already performed on sending)
git-svn-id: file:///svn/phpbb/trunk@6660 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 33fa839df4..fa28b568b8 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1032,6 +1032,7 @@ while ($row = $db->sql_fetchrow($result)) if ($row['user_avatar'] && $user->optionget('viewavatars')) { $avatar_img = ''; + switch ($row['user_avatar_type']) { case AVATAR_UPLOAD: @@ -1042,8 +1043,8 @@ while ($row = $db->sql_fetchrow($result)) $avatar_img = $config['avatar_gallery_path'] . '/'; break; } - $avatar_img .= $row['user_avatar']; + $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="" />'; } |