diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-11-13 09:52:21 -0800 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-11-13 09:52:21 -0800 |
| commit | 52845b22f24c19757a437ab0bda8b7583a10a398 (patch) | |
| tree | fe524543e830c607682477ef751b43f1ebb8ebd5 /phpBB/includes/ucp | |
| parent | e48b2c07ebe95aaff93eed6c7df5dff5d6c50fe2 (diff) | |
| parent | 13a4ceedb18ba938d3cd18e2f68707385bc9283a (diff) | |
| download | forums-52845b22f24c19757a437ab0bda8b7583a10a398.tar forums-52845b22f24c19757a437ab0bda8b7583a10a398.tar.gz forums-52845b22f24c19757a437ab0bda8b7583a10a398.tar.bz2 forums-52845b22f24c19757a437ab0bda8b7583a10a398.tar.xz forums-52845b22f24c19757a437ab0bda8b7583a10a398.zip | |
Merge pull request #1815 from marc1706/ticket/11525
[ticket/11525] Only remove group or user prefix from given avatar data
Diffstat (limited to 'phpBB/includes/ucp')
| -rw-r--r-- | phpBB/includes/ucp/ucp_groups.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php index a75d2e9bfc..32b27b55b4 100644 --- a/phpBB/includes/ucp/ucp_groups.php +++ b/phpBB/includes/ucp/ucp_groups.php @@ -465,7 +465,7 @@ class ucp_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'); } // Did we submit? diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index 3f58ce20b4..f7c6aca9e8 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -567,7 +567,7 @@ class ucp_profile $avatar_drivers = $phpbb_avatar_manager->get_enabled_drivers(); // This is normalised data, without the user_ prefix - $avatar_data = \phpbb\avatar\manager::clean_row($user->data); + $avatar_data = \phpbb\avatar\manager::clean_row($user->data, 'user'); if ($submit) { |