hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix jpeg files sometimes being returned with a .jpe extension (#7881) 

While this isn't exactly *wrong*, files uploaded with a “.jpe” extension will
keep that extension, which will often cause them to be served with an
incorrect mimetype.
signup-info-prompt
ThibG 2018-06-24 13:33:06 +02:00 committed by Eugen Rochko
parent 23955d956e
commit 50a2854f92
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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