forked from treehouse/mastodon
Try to avoid any potential loops
parent
306eb6e9c9
commit
8b9206f7d9
|
@ -125,13 +125,9 @@ class Account < ApplicationRecord
|
||||||
|
|
||||||
def save_with_optional_avatar!
|
def save_with_optional_avatar!
|
||||||
save!
|
save!
|
||||||
rescue ActiveRecord::RecordInvalid => invalid
|
rescue ActiveRecord::RecordInvalid
|
||||||
if invalid.record.errors[:avatar_file_size] || invalid.record.errors[:avatar_content_type]
|
self.avatar = nil
|
||||||
self.avatar = nil
|
save!
|
||||||
retry
|
|
||||||
end
|
|
||||||
|
|
||||||
raise invalid
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def avatar_remote_url=(url)
|
def avatar_remote_url=(url)
|
||||||
|
|
Loading…
Reference in New Issue