makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3286 from MGaetan89/ticket/13498

Browse source 
[ticket/13498] Change get_user_avatar() calls with phpbb_get_avatar()
This commit is contained in:
Marc Alexander 2015-01-12 21:44:06 +01:00
commit aeafbb5c62
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
phpBB/phpbb/user_loader.php
View file

@ -175,7 +175,7 @@ class user_loader
/** /**
* Get avatar * Get avatar
* *
* @param int $user_id User ID of the user you want to retreive the avatar for * @param int $user_id User ID of the user you want to retrieve the avatar for
* @param bool $query Should we query the database if this user has not yet been loaded? * @param bool $query Should we query the database if this user has not yet been loaded?
* Typically this should be left as false and you should make sure * Typically this should be left as false and you should make sure
* you load users ahead of time with load_users() * you load users ahead of time with load_users()
@ -188,12 +188,14 @@ class user_loader
return ''; return '';
} }
if (!function_exists('get_user_avatar')) $row = array(
{ 'avatar' => $user['user_avatar'],
include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext); 'avatar_type' => $user['user_avatar_type'],
} 'avatar_width' => $user['user_avatar_width'],
'avatar_height' => $user['user_avatar_height'],
);
return get_user_avatar($user['user_avatar'], $user['user_avatar_type'], $user['user_avatar_width'], $user['user_avatar_height']); return phpbb_get_avatar($row, 'USER_AVATAR');
} }
/** /**