diff options
| author | Evan Prodromou <evan@status.net> | 2009-10-01 11:30:04 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2009-10-01 11:30:04 -0400 |
| commit | a41ed1a66a902b078876be7528183ab61e6a3d03 (patch) | |
| tree | db690c52820ebd4aefae6222cb4f3b48c2d9398f /actions/avatarsettings.php | |
| parent | 3449843f839b6c17618b27b031c608860761cd32 (diff) | |
| parent | acc78972383c2346b5729192ab00c90c48c5b2a6 (diff) | |
Merge branch '0.9.x' into schema
Diffstat (limited to 'actions/avatarsettings.php')
| -rw-r--r-- | actions/avatarsettings.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php index 02a684b38..ded419dd7 100644 --- a/actions/avatarsettings.php +++ b/actions/avatarsettings.php @@ -362,13 +362,13 @@ class AvatarsettingsAction extends AccountSettingsAction $profile = $user->getProfile(); $avatar = $profile->getOriginalAvatar(); - $avatar->delete(); + if($avatar) $avatar->delete(); $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE); - $avatar->delete(); + if($avatar) $avatar->delete(); $avatar = $profile->getAvatar(AVATAR_STREAM_SIZE); - $avatar->delete(); + if($avatar) $avatar->delete(); $avatar = $profile->getAvatar(AVATAR_MINI_SIZE); - $avatar->delete(); + if($avatar) $avatar->delete(); $this->showForm(_('Avatar deleted.'), true); } |