diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-06-16 12:35:51 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-06-16 12:35:51 +0200 |
| commit | 80768b526bd3f7167703dad8be1b297bbb9cc3f7 (patch) | |
| tree | 457fcc03f211840837913e004033074ee98b342b /phpBB/phpbb/user_loader.php | |
| parent | d5414592f102c1be9cd109d8250c5cced2a6c327 (diff) | |
| parent | dc9245dd7a5a13f67667df835957740b553d2313 (diff) | |
| download | forums-80768b526bd3f7167703dad8be1b297bbb9cc3f7.tar forums-80768b526bd3f7167703dad8be1b297bbb9cc3f7.tar.gz forums-80768b526bd3f7167703dad8be1b297bbb9cc3f7.tar.bz2 forums-80768b526bd3f7167703dad8be1b297bbb9cc3f7.tar.xz forums-80768b526bd3f7167703dad8be1b297bbb9cc3f7.zip | |
Merge branch '3.1.x'
Conflicts:
phpBB/phpbb/user_loader.php
Diffstat (limited to 'phpBB/phpbb/user_loader.php')
| -rw-r--r-- | phpBB/phpbb/user_loader.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/phpbb/user_loader.php b/phpBB/phpbb/user_loader.php index 0b192e4452..cdd28329db 100644 --- a/phpBB/phpbb/user_loader.php +++ b/phpBB/phpbb/user_loader.php @@ -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); } /** |