mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-21 20:15:10 +01:00
Code Issues Projects Releases Wiki Activity

Try to avoid any potential loops

Browse Source
This commit is contained in:
Eugen 2017-01-19 02:14:57 +01:00 committed by GitHub
parent 306eb6e9c9
commit 8b9206f7d9
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/models/account.rb
View File

@ -125,13 +125,9 @@ class Account < ApplicationRecord
def save_with_optional_avatar!
save!
rescue ActiveRecord::RecordInvalid => invalid
if invalid.record.errors[:avatar_file_size] || invalid.record.errors[:avatar_content_type]
self.avatar = nil
retry
end
raise invalid
rescue ActiveRecord::RecordInvalid
self.avatar = nil
save!
end
def avatar_remote_url=(url)