1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-19 23:32:02 +02:00

Merge pull request #4057 from marc1706/ticket/14334

[ticket/14334] Use phpbb_get_avatar() in user_loader

* marc1706/ticket/14334:
  [ticket/14334] Use phpbb_get_avatar() in user_loader
This commit is contained in:
Tristan Darricau 2015-12-05 11:02:55 +01:00
commit 7eef7b2ea2

View File

@ -189,12 +189,7 @@ class user_loader
return '';
}
if (!function_exists('get_user_avatar'))
{
include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext);
}
return get_user_avatar($user['user_avatar'], $user['user_avatar_type'], $user['user_avatar_width'], $user['user_avatar_height'], 'USER_AVATAR', false, $lazy);
return phpbb_get_avatar(\phpbb\avatar\manager::clean_row($user, 'user'), 'USER_AVATAR', false, $lazy);
}
/**