nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Create special case to prefer "jpeg" over "jpe" file extension (#7841)

This commit is contained in:
Eugen Rochko 2018-06-18 17:27:05 +02:00 committed by GitHub
parent 7e9e7c642d
commit 50689f0d41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/concerns/attachmentable.rb
View File

@ -41,7 +41,9 @@ module Attachmentable
extensions_for_mime_type = mime_type.empty? ? [] : mime_type.first.extensions extensions_for_mime_type = mime_type.empty? ? [] : mime_type.first.extensions
original_extension = Paperclip::Interpolations.extension(attachment, :original) original_extension = Paperclip::Interpolations.extension(attachment, :original)
proper_extension = extensions_for_mime_type.first.to_s
proper_extension = 'jpeg' if proper_extension == 'jpe'
extensions_for_mime_type.include?(original_extension) ? original_extension : extensions_for_mime_type.first extensions_for_mime_type.include?(original_extension) ? original_extension : proper_extension
end end
end end