diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2008-07-29 13:12:57 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2008-07-29 13:12:57 +0000 |
| commit | df25057773b3287fa8eaef503dd1357c25009d94 (patch) | |
| tree | ce1cca39c9c826125814b118e253014b0862d66e /phpBB/includes/functions_user.php | |
| parent | 86dddd43b621fb3a91b8257f4dd534e4a1077809 (diff) | |
| download | forums-df25057773b3287fa8eaef503dd1357c25009d94.tar forums-df25057773b3287fa8eaef503dd1357c25009d94.tar.gz forums-df25057773b3287fa8eaef503dd1357c25009d94.tar.bz2 forums-df25057773b3287fa8eaef503dd1357c25009d94.tar.xz forums-df25057773b3287fa8eaef503dd1357c25009d94.zip | |
Ooops. Avatars should work again
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8709 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_user.php')
| -rw-r--r-- | phpBB/includes/functions_user.php | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index e88ded1b85..e21b720f4b 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -2297,15 +2297,21 @@ function avatar_process_user(&$error, $custom_userdata = false) // Do we actually have any data to update? if (sizeof($sql_ary)) { + $ext_new = $ext_old = ''; if (isset($sql_ary['user_avatar'])) { $userdata = ($custom_userdata === false) ? $user->data : $custom_userdata; + $ext_new = (empty($sql_ary['user_avatar'])) ? '' : substr(strrchr($sql_ary['user_avatar'], '.'), 1); + $ext_old = (empty($userdata['user_avatar'])) ? '' : substr(strrchr($userdata['user_avatar'], '.'), 1); - // Delete old avatar if present - if ((!empty($userdata['user_avatar']) && empty($sql_ary['user_avatar']) && $userdata['user_avatar_type'] == AVATAR_UPLOAD) - || ( !empty($userdata['user_avatar']) && !empty($sql_ary['user_avatar']) && $userdata['user_avatar_type'] == AVATAR_UPLOAD)) + if ($userdata['user_avatar_type'] == AVATAR_UPLOAD) { - avatar_delete('user', $userdata); + // Delete old avatar if present + if ((!empty($userdata['user_avatar']) && empty($sql_ary['user_avatar'])) + || ( !empty($userdata['user_avatar']) && !empty($sql_ary['user_avatar']) && $ext_new !== $ext_old)) + { + avatar_delete('user', $userdata); + } } } |