diff options
| author | Gaëtan Muller <m.gaetan89@gmail.com> | 2015-01-11 21:09:21 +0100 |
|---|---|---|
| committer | Gaëtan Muller <m.gaetan89@gmail.com> | 2015-01-11 21:09:21 +0100 |
| commit | 35d37fdff44365ccb01e1599759d2a5c02084184 (patch) | |
| tree | 9119dfc015fcf0a9b840ec800c48fef0ed02ce30 | |
| parent | ef1be6e247cf01a99e68ec85600a80fd62ca9a75 (diff) | |
| download | forums-35d37fdff44365ccb01e1599759d2a5c02084184.tar forums-35d37fdff44365ccb01e1599759d2a5c02084184.tar.gz forums-35d37fdff44365ccb01e1599759d2a5c02084184.tar.bz2 forums-35d37fdff44365ccb01e1599759d2a5c02084184.tar.xz forums-35d37fdff44365ccb01e1599759d2a5c02084184.zip | |
[ticket/13498] Update calls to `get_user_avatar()`
PHPBB3-13498
| -rw-r--r-- | phpBB/phpbb/user_loader.php | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/phpBB/phpbb/user_loader.php b/phpBB/phpbb/user_loader.php index 24e663b150..0b192e4452 100644 --- a/phpBB/phpbb/user_loader.php +++ b/phpBB/phpbb/user_loader.php @@ -175,7 +175,7 @@ class user_loader /** * 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? * Typically this should be left as false and you should make sure * you load users ahead of time with load_users() @@ -188,12 +188,14 @@ class user_loader return ''; } - if (!function_exists('get_user_avatar')) - { - include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext); - } + $row = array( + 'avatar' => $user['user_avatar'], + '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'); } /** |