diff options
Diffstat (limited to 'phpBB/phpbb/user_loader.php')
| -rw-r--r-- | phpBB/phpbb/user_loader.php | 10 | 
1 files changed, 3 insertions, 7 deletions
diff --git a/phpBB/phpbb/user_loader.php b/phpBB/phpbb/user_loader.php index 24e663b150..967d96d73a 100644 --- a/phpBB/phpbb/user_loader.php +++ b/phpBB/phpbb/user_loader.php @@ -179,21 +179,17 @@ class user_loader  	* @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() +	* @param bool @lazy If true, will be lazy loaded (requires JS)  	* @return string  	*/ -	public function get_avatar($user_id, $query = false) +	public function get_avatar($user_id, $query = false, $lazy = false)  	{  		if (!($user = $this->get_user($user_id, $query)))  		{  			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']); +		return phpbb_get_avatar(\phpbb\avatar\manager::clean_row($user, 'user'), 'USER_AVATAR', false, $lazy);  	}  	/**  | 
