mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 05:50:42 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x'

Browse Source 
Conflicts:
	phpBB/phpbb/user_loader.php
This commit is contained in:
Marc Alexander
2015-06-16 12:35:51 +02:00
parent d5414592f1 dc9245dd7a
commit 80768b526b
13 changed files with 54 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
phpBB/phpbb/user_loader.php
View File

@@ -179,9 +179,10 @@ 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)))
{
@@ -195,7 +196,7 @@ class user_loader
'avatar_height' => $user['user_avatar_height'],
);
return phpbb_get_avatar($row, 'USER_AVATAR');
return phpbb_get_avatar($row, 'USER_AVATAR', false, $lazy);
}
/**