From: ThibG Date: Sun, 24 Jun 2018 11:33:06 +0000 (+0200) Subject: Fix jpeg files sometimes being returned with a .jpe extension (#7881) X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=50a2854f922ebdd2c056870a0de402329bdf1bb3;p=mastodon.git 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. --- diff --git a/app/models/concerns/attachmentable.rb b/app/models/concerns/attachmentable.rb index db63c3eca..44bdfa39a 100644 --- a/app/models/concerns/attachmentable.rb +++ b/app/models/concerns/attachmentable.rb @@ -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