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/includes/functions_compatibility.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/includes/functions_compatibility.php')
| -rw-r--r-- | phpBB/includes/functions_compatibility.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/includes/functions_compatibility.php b/phpBB/includes/functions_compatibility.php index 31019061a9..4b085a6050 100644 --- a/phpBB/includes/functions_compatibility.php +++ b/phpBB/includes/functions_compatibility.php @@ -30,10 +30,11 @@ if (!defined('IN_PHPBB')) * @param string $avatar_height Height of users avatar * @param string $alt Optional language string for alt tag within image, can be a language key or text * @param bool $ignore_config Ignores the config-setting, to be still able to view the avatar in the UCP +* @param bool $lazy If true, will be lazy loaded (requires JS) * * @return string Avatar image */ -function get_user_avatar($avatar, $avatar_type, $avatar_width, $avatar_height, $alt = 'USER_AVATAR', $ignore_config = false) +function get_user_avatar($avatar, $avatar_type, $avatar_width, $avatar_height, $alt = 'USER_AVATAR', $ignore_config = false, $lazy = false) { // map arguments to new function phpbb_get_avatar() $row = array( @@ -43,7 +44,7 @@ function get_user_avatar($avatar, $avatar_type, $avatar_width, $avatar_height, $ 'avatar_height' => $avatar_height, ); - return phpbb_get_avatar($row, $alt, $ignore_config); + return phpbb_get_avatar($row, $alt, $ignore_config, $lazy); } /** |