port tootsuite/#12125 to monsterfork: Fix attachment not being re-downloaded even if file is not stored

Change the behaviour of remotable concern. Previously, it would skip
downloading an attachment if the stored remote URL is identical to
the new one. Now it would not be skipped if the attachment is not
actually currently stored by Paperclip.

1 files changed, 3 insertions, 4 deletions

diff --git a/app/models/account.rb b/app/models/account.rb
index 20b93ddc5..28ba35148 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -453,10 +453,9 @@ class Account < ApplicationRecord
   def save_with_optional_media!
     save!
   rescue ActiveRecord::RecordInvalid
-    self.avatar              = nil
-    self.header              = nil
-    self[:avatar_remote_url] = ''
-    self[:header_remote_url] = ''
+    self.avatar = nil
+    self.header = nil
+
     save!
   end