From: Yusuke Abe <moonset20@gmail.com>
Date: Thu, 13 Apr 2017 19:52:56 +0000 (+0900)
Subject: Add filename extension to paperclip (#1718)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=169c68a739e2907ea29313983bc5a849f585bed3;p=mastodon.git

Add filename extension to paperclip (#1718)
---

diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb
index 2a2ef8fea..c58f1b06c 100644
--- 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), content_type_extension(attachment, style)].delete_if(&:empty?).join('.')
 end
 
 if ENV['S3_ENABLED'] == 'true'