diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-10-19 13:55:48 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-10-19 13:55:48 +0000 |
| commit | fcd9b898f156b9b0269a2d2108b9d83660b791d0 (patch) | |
| tree | 9a2b09047c79fa386619f5ecd63306fe2bdf7ef1 /phpBB/includes/ucp/ucp_profile.php | |
| parent | 9a0ca3d334396940cc32ed153ccdfef76ece8d9e (diff) | |
| download | forums-fcd9b898f156b9b0269a2d2108b9d83660b791d0.tar forums-fcd9b898f156b9b0269a2d2108b9d83660b791d0.tar.gz forums-fcd9b898f156b9b0269a2d2108b9d83660b791d0.tar.bz2 forums-fcd9b898f156b9b0269a2d2108b9d83660b791d0.tar.xz forums-fcd9b898f156b9b0269a2d2108b9d83660b791d0.zip | |
Revised attachment categories a bit
Fixes for the following bugs:
#4830
#4818
#4816
#4810
#4808
#4798
#4796
#4772
#4662
#4646
#4546
#4524
#4270
I hope not having introduced additional severe errors :)
git-svn-id: file:///svn/phpbb/trunk@6511 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp/ucp_profile.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index cabe813f96..376573d059 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -597,11 +597,7 @@ class ucp_profile // Delete old avatar if present if ($user->data['user_avatar'] && $filename != $user->data['user_avatar'] && $user->data['user_avatar_type'] != AVATAR_GALLERY) { - // Check if the users avatar is actually a group avatar - if (strpos($user->data['user_avatar'], 'g' . $user->data['group_id'] . '_') !== 0 && strpos($user->data['user_avatar'], $user->data['user_id'] . '_') === 0) - { - avatar_delete($user->data['user_avatar']); - } + avatar_delete('user', $user->data); } } |