diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-07-28 15:31:09 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-07-28 15:31:09 +0200 |
| commit | f567b2bb69dd85d7a85bf11bd9a4dd7421ef0b45 (patch) | |
| tree | 83abef558de006faf19087433cb9d71ccb9e9d68 /phpBB/includes | |
| parent | ae62bc46428948cdfbb735c8b9b566d02c0f78f0 (diff) | |
| parent | cf9696767715eeef7d82f9dcd5533c50c4f119aa (diff) | |
| download | forums-f567b2bb69dd85d7a85bf11bd9a4dd7421ef0b45.tar forums-f567b2bb69dd85d7a85bf11bd9a4dd7421ef0b45.tar.gz forums-f567b2bb69dd85d7a85bf11bd9a4dd7421ef0b45.tar.bz2 forums-f567b2bb69dd85d7a85bf11bd9a4dd7421ef0b45.tar.xz forums-f567b2bb69dd85d7a85bf11bd9a4dd7421ef0b45.zip | |
Merge pull request #5459 from mrgoldy/ticket/15886
[ticket/15886] Group helper functions
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/functions_content.php | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 5cc6826cb9..2e2b2a01d8 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4131,9 +4131,9 @@ function phpbb_get_user_avatar($user_row, $alt = 'USER_AVATAR', $ignore_config = * * @return string Avatar html */ -function phpbb_get_group_avatar($user_row, $alt = 'GROUP_AVATAR', $ignore_config = false, $lazy = false) +function phpbb_get_group_avatar($group_row, $alt = 'GROUP_AVATAR', $ignore_config = false, $lazy = false) { - $row = \phpbb\avatar\manager::clean_row($user_row, 'group'); + $row = \phpbb\avatar\manager::clean_row($group_row, 'group'); return phpbb_get_avatar($row, $alt, $ignore_config, $lazy); } diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index a15a03f966..2542be5e02 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -1482,6 +1482,8 @@ function truncate_string($string, $max_length = 60, $max_store_length = 255, $al * Get username details for placing into templates. * This function caches all modes on first call, except for no_profile and anonymous user - determined by $user_id. * +* @html Username spans and links +* * @param string $mode Can be profile (for getting an url to the profile), username (for obtaining the username), colour (for obtaining the user colour), full (for obtaining a html string representing a coloured link to the users profile) or no_profile (the same as full but forcing no profile link) * @param int $user_id The users id * @param string $username The users name @@ -1501,6 +1503,7 @@ function get_username_string($mode, $user_id, $username, $username_colour = '', { global $phpbb_root_path, $phpEx; + /** @html Username spans and links for usage in the template */ $_profile_cache['base_url'] = append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile&u={USER_ID}'); $_profile_cache['tpl_noprofile'] = '<span class="username">{USERNAME}</span>'; $_profile_cache['tpl_noprofile_colour'] = '<span style="color: {USERNAME_COLOUR};" class="username-coloured">{USERNAME}</span>'; |