diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-10-24 13:55:23 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-10-24 13:55:23 +0200 |
| commit | 9d4d212e0f71789e1f0332046dd852d80ab9c8ba (patch) | |
| tree | e3de96df60d80c913414cc7ac54952de7a78c955 /phpBB/includes/functions_display.php | |
| parent | 2adf3d7a3473fe8d01e850329bd935e97f09668d (diff) | |
| download | forums-9d4d212e0f71789e1f0332046dd852d80ab9c8ba.tar forums-9d4d212e0f71789e1f0332046dd852d80ab9c8ba.tar.gz forums-9d4d212e0f71789e1f0332046dd852d80ab9c8ba.tar.bz2 forums-9d4d212e0f71789e1f0332046dd852d80ab9c8ba.tar.xz forums-9d4d212e0f71789e1f0332046dd852d80ab9c8ba.zip | |
[ticket/11525] Only remove group or user prefix from given avatar data
Until now, the user data had both user_id and group_id keys in the avatar
data. As both group_ and user_ prefixes were removed the group_id was
collapsed onto the user_id and therefore all users in the same group had
the same prefix for their uploaded avatars. This patch will make sure
that the correct id is used depending on whether it's a group's or user's
avatar data.
PHPBB3-11525
Diffstat (limited to 'phpBB/includes/functions_display.php')
| -rw-r--r-- | phpBB/includes/functions_display.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index c6ab5df90f..f03e4c01d0 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -1352,7 +1352,7 @@ function get_user_rank($user_rank, $user_posts, &$rank_title, &$rank_img, &$rank */ function phpbb_get_user_avatar($user_row, $alt = 'USER_AVATAR', $ignore_config = false) { - $row = \phpbb\avatar\manager::clean_row($user_row); + $row = \phpbb\avatar\manager::clean_row($user_row, 'user'); return phpbb_get_avatar($row, $alt, $ignore_config); } @@ -1367,7 +1367,7 @@ function phpbb_get_user_avatar($user_row, $alt = 'USER_AVATAR', $ignore_config = */ function phpbb_get_group_avatar($user_row, $alt = 'GROUP_AVATAR', $ignore_config = false) { - $row = \phpbb\avatar\manager::clean_row($user_row); + $row = \phpbb\avatar\manager::clean_row($user_row, 'group'); return phpbb_get_avatar($row, $alt, $ignore_config); } |