aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2015-06-17 15:39:12 +0200
committerMarc Alexander <admin@m-a-styles.de>2015-06-17 15:39:12 +0200
commitef890e3363547a0b8f99f7036265e1c072809b0c (patch)
tree96a6331bb5da42213a59d154d85acb72ca086ebb /phpBB/includes
parent9f17e224c4fc491bc28180a7a3f13215c6fea9b0 (diff)
parent8b28881aa2e23a5dedf0fee9b243f0f9415b7558 (diff)
downloadforums-ef890e3363547a0b8f99f7036265e1c072809b0c.tar
forums-ef890e3363547a0b8f99f7036265e1c072809b0c.tar.gz
forums-ef890e3363547a0b8f99f7036265e1c072809b0c.tar.bz2
forums-ef890e3363547a0b8f99f7036265e1c072809b0c.tar.xz
forums-ef890e3363547a0b8f99f7036265e1c072809b0c.zip
Merge branch '3.1.x'
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/functions.php10
1 files changed, 6 insertions, 4 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 6a1a50952f..bb4fc5dbae 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3957,13 +3957,14 @@ function phpbb_build_hidden_fields_for_query_params($request, $exclude = null)
* @param array $user_row Row from the users table
* @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 html
*/
-function phpbb_get_user_avatar($user_row, $alt = 'USER_AVATAR', $ignore_config = false)
+function phpbb_get_user_avatar($user_row, $alt = 'USER_AVATAR', $ignore_config = false, $lazy = false)
{
$row = \phpbb\avatar\manager::clean_row($user_row, 'user');
- return phpbb_get_avatar($row, $alt, $ignore_config);
+ return phpbb_get_avatar($row, $alt, $ignore_config, $lazy);
}
/**
@@ -3972,13 +3973,14 @@ function phpbb_get_user_avatar($user_row, $alt = 'USER_AVATAR', $ignore_config =
* @param array $group_row Row from the groups table
* @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 html
*/
-function phpbb_get_group_avatar($user_row, $alt = 'GROUP_AVATAR', $ignore_config = false)
+function phpbb_get_group_avatar($user_row, $alt = 'GROUP_AVATAR', $ignore_config = false, $lazy = false)
{
$row = \phpbb\avatar\manager::clean_row($user_row, 'group');
- return phpbb_get_avatar($row, $alt, $ignore_config);
+ return phpbb_get_avatar($row, $alt, $ignore_config, $lazy);
}
/**