aboutsummaryrefslogtreecommitdiffstats
path: root/app/models
diff options
context:
space:
mode:
Diffstat (limited to 'app/models')
-rw-r--r--app/models/user.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index e0698a47f..bcad6229f 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -275,7 +275,9 @@ class User < ActiveRecord::Base
def set_profile_photo(new_profile_photo)
ActiveRecord::Base.transaction do
if !self.profile_photo.nil?
- self.profile_photo.destroy
+ old_profile_photo = self.profile_photo
+ self.profile_photo = nil
+ old_profile_photo.destroy
end
new_profile_photo.user = self
self.profile_photo = new_profile_photo