diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-04-01 01:14:04 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-04-01 01:14:04 +0000 |
| commit | 4d65caab3f93c01d3018bb6f191260195db034fe (patch) | |
| tree | 10efe58e83711e43c0a11b16ae5ef288877a0731 /phpBB/viewtopic.php | |
| parent | 823a484e77ba9e1ce51451054fa120b6201dd298 (diff) | |
| download | forums-4d65caab3f93c01d3018bb6f191260195db034fe.tar forums-4d65caab3f93c01d3018bb6f191260195db034fe.tar.gz forums-4d65caab3f93c01d3018bb6f191260195db034fe.tar.bz2 forums-4d65caab3f93c01d3018bb6f191260195db034fe.tar.xz forums-4d65caab3f93c01d3018bb6f191260195db034fe.zip | |
Re-enable avatar display
git-svn-id: file:///svn/phpbb/trunk@3774 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 7aeae532e6..7065518d75 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -461,7 +461,7 @@ $force_encoding = ''; $i = 0; // Go ahead and pull all data for this topic -$sql = "SELECT u.username, u.user_id, u.user_posts, u.user_from, u.user_karma, u.user_website, u.user_email, u.user_icq, u.user_aim, u.user_yim, u.user_regdate, u.user_msnm, u.user_viewemail, u.user_rank, u.user_sig, u.user_avatar, u.user_avatar_type, p.* +$sql = "SELECT u.username, u.user_id, u.user_posts, u.user_from, u.user_karma, u.user_website, u.user_email, u.user_icq, u.user_aim, u.user_yim, u.user_regdate, u.user_msnm, u.user_viewemail, u.user_rank, u.user_sig, u.user_avatar, u.user_avatar_type, u.user_avatar_width, u.user_avatar_height, p.* FROM " . POSTS_TABLE . " p, " . USERS_TABLE . " u WHERE p.topic_id = $topic_id " . (($auth->acl_get('m_approve', $forum_id)) ? '' : 'AND p.post_approved = 1') . " @@ -526,10 +526,9 @@ if ($row = $db->sql_fetchrow($result)) $user_cache[$poster_id]['joined'] = ($row['user_id']) ? $user->lang['JOINED'] . ': ' . $user->format_date($row['user_regdate'], $user->lang['DATE_FORMAT']) : ''; } - - if (isset($user_cache[$poster_id]['avatar'])) + if (!isset($user_cache[$poster_id]['avatar'])) { - if ($row['user_avatar_type'] && $poster_id && $row['user_allowavatar']) + if ($row['user_avatar_type'] && $auth->acl_get('u_setavatar')) { switch ($row['user_avatar_type']) { |