diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-12-05 11:02:55 +0100 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-12-05 11:02:55 +0100 |
| commit | 7eef7b2ea2a62880aafe807a1070c17c96b48a70 (patch) | |
| tree | 3af5904bcdf6bf53eb66692f654f6d42e82f78f3 | |
| parent | 8899829752538946d844e34e10d9feacb72c66a8 (diff) | |
| parent | 91869cc43cd89109f25c35f6371becb4b3d690d9 (diff) | |
| download | forums-7eef7b2ea2a62880aafe807a1070c17c96b48a70.tar forums-7eef7b2ea2a62880aafe807a1070c17c96b48a70.tar.gz forums-7eef7b2ea2a62880aafe807a1070c17c96b48a70.tar.bz2 forums-7eef7b2ea2a62880aafe807a1070c17c96b48a70.tar.xz forums-7eef7b2ea2a62880aafe807a1070c17c96b48a70.zip | |
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
| -rw-r--r-- | phpBB/phpbb/user_loader.php | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/phpBB/phpbb/user_loader.php b/phpBB/phpbb/user_loader.php index 5ce8ca2d4d..967d96d73a 100644 --- a/phpBB/phpbb/user_loader.php +++ b/phpBB/phpbb/user_loader.php @@ -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); } /** |