aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/user_loader.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2015-12-03 16:43:00 +0100
committerMarc Alexander <admin@m-a-styles.de>2015-12-03 16:43:00 +0100
commit91869cc43cd89109f25c35f6371becb4b3d690d9 (patch)
tree3af5904bcdf6bf53eb66692f654f6d42e82f78f3 /phpBB/phpbb/user_loader.php
parent8899829752538946d844e34e10d9feacb72c66a8 (diff)
downloadforums-91869cc43cd89109f25c35f6371becb4b3d690d9.tar
forums-91869cc43cd89109f25c35f6371becb4b3d690d9.tar.gz
forums-91869cc43cd89109f25c35f6371becb4b3d690d9.tar.bz2
forums-91869cc43cd89109f25c35f6371becb4b3d690d9.tar.xz
forums-91869cc43cd89109f25c35f6371becb4b3d690d9.zip
[ticket/14334] Use phpbb_get_avatar() in user_loader
PHPBB3-14334
Diffstat (limited to 'phpBB/phpbb/user_loader.php')
-rw-r--r--phpBB/phpbb/user_loader.php7
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);
}
/**