diff options
| author | Starfall <root@starfall.blue> | 2020-04-11 20:04:56 -0500 |
|---|---|---|
| committer | Starfall <root@starfall.blue> | 2020-04-11 20:04:56 -0500 |
| commit | b107e4f771f036b214563764fcd95786f8016ee7 (patch) | |
| tree | 22397105f42f30eceacdf84671d1c4d807c9dd73 /app/models/concerns/attachmentable.rb | |
| parent | 144ecfcfc7d9974117f1563084409a9558290a60 (diff) | |
| parent | c47be5bd864a1f5244f35122ba7fae31a149c73d (diff) | |
Merge branch 'glitch'
Diffstat (limited to 'app/models/concerns/attachmentable.rb')
| -rw-r--r-- | app/models/concerns/attachmentable.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/concerns/attachmentable.rb b/app/models/concerns/attachmentable.rb index 43ff8ac12..18b872c1e 100644 --- a/app/models/concerns/attachmentable.rb +++ b/app/models/concerns/attachmentable.rb @@ -74,7 +74,7 @@ module Attachmentable self.class.attachment_definitions.each_key do |attachment_name| attachment = send(attachment_name) - next if attachment.blank? || attachment.queued_for_write[:original].blank? + next if attachment.blank? || attachment.queued_for_write[:original].blank? || attachment.options[:preserve_files] attachment.instance_write :file_name, SecureRandom.hex(8) + File.extname(attachment.instance_read(:file_name)) end |