mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-13 04:13:29 +02:00
Code Issues Releases Wiki Activity

Re-enable avatar display

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@3774 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2003-04-01 01:14:04 +00:00
parent 823a484e77
commit 4d65caab3f
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
phpBB/viewtopic.php
View File

@ -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'])
{