about summary refs log tree commit diff
path: root/app/models/account.rb
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2019-10-09 07:10:46 +0200
committermultiple creatures <dev@multiple-creature.party>2020-02-20 23:25:39 -0600
commit95e88ba4347a8c2d2aa3ee8762b32d524e5629a2 (patch)
treefd889fc67708e384cc661a0295db1f47f8c29a1c /app/models/account.rb
parenta373fdc1c3b1e6646ffc243f3f5bd926aeda041f (diff)
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.
Diffstat (limited to 'app/models/account.rb')
-rw-r--r--app/models/account.rb7
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