]> cat aescling's git repositories - mastodon.git/commitdiff
Add filename extension to paperclip (#1718)
authorYusuke Abe <moonset20@gmail.com>
Thu, 13 Apr 2017 19:52:56 +0000 (04:52 +0900)
committerEugen <eugen@zeonfederated.com>
Thu, 13 Apr 2017 19:52:56 +0000 (21:52 +0200)
config/initializers/paperclip.rb

index 2a2ef8fea7dcfb547af4747d0c1c93b69e4c018b..c58f1b06c0bb324f5de23ee4845f20a11116bd66 100644 (file)
@@ -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), content_type_extension(attachment, style)].delete_if(&:empty?).join('.')
 end
 
 if ENV['S3_ENABLED'] == 'true'