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/acp | |
| 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/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_groups.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php index ad29a5521b..8f417e753c 100644 --- a/phpBB/includes/acp/acp_groups.php +++ b/phpBB/includes/acp/acp_groups.php @@ -324,7 +324,7 @@ class acp_groups $avatar_drivers = $phpbb_avatar_manager->get_enabled_drivers(); // This is normalised data, without the group_ prefix - $avatar_data = \phpbb\avatar\manager::clean_row($group_row); + $avatar_data = \phpbb\avatar\manager::clean_row($group_row, 'group'); } diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 8853200ddc..9feb1074d0 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -1742,7 +1742,7 @@ class acp_users $avatar_drivers = $phpbb_avatar_manager->get_enabled_drivers(); // This is normalised data, without the user_ prefix - $avatar_data = \phpbb\avatar\manager::clean_row($user_row); + $avatar_data = \phpbb\avatar\manager::clean_row($user_row, 'user'); if ($submit) { |