Try to avoid any potential loops

2017-01-19 02:14:57 +01:00 · 2017-01-19 02:14:57 +01:00 · 8b9206f7d9
commit 8b9206f7d9
parent 306eb6e9c9
1 changed files with 3 additions and 7 deletions
--- a/app/models/account.rb
+++ b/app/models/account.rb
@ -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)