commit: ee3e0a93f43d7236928dc2dd63361b69cd7883ee
parent: d1290fbd8f0bbdcef7c0d7eec2b8865ddf9ae804
Author: alpaca-tc <alpaca-tc@alpaca.tc>
Date: Sat, 6 May 2017 04:32:14 +0900
Fixes unknown mime type (#2822)
Diffstat:
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/models/concerns/attachmentable.rb b/app/models/concerns/attachmentable.rb
@@ -15,7 +15,7 @@ module Attachmentable
next if attachment.blank?
extension = Paperclip::Interpolations.content_type_extension(attachment, :original)
basename = Paperclip::Interpolations.basename(attachment, :original)
- attachment.instance_write :file_name, [basename, extension].delete_if(&:empty?).join('.')
+ attachment.instance_write :file_name, [basename, extension].delete_if(&:blank?).join('.')
end
end
end
diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb
@@ -128,7 +128,7 @@ class MediaAttachment < ApplicationRecord
self.type = VIDEO_MIME_TYPES.include?(file_content_type) ? :video : :image
extension = appropriate_extension
basename = Paperclip::Interpolations.basename(file, :original)
- file.instance_write :file_name, [basename, extension].delete_if(&:empty?).join('.')
+ file.instance_write :file_name, [basename, extension].delete_if(&:blank?).join('.')
end
def set_meta
diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb
@@ -4,7 +4,7 @@ Paperclip.options[:read_timeout] = 60
Paperclip.interpolates :filename do |attachment, style|
return attachment.original_filename if style == :original
- [basename(attachment, style), extension(attachment, style)].delete_if(&:empty?).join('.')
+ [basename(attachment, style), extension(attachment, style)].delete_if(&:blank?).join('.')
end
if ENV['S3_ENABLED'] == 'true'