diff options
| author | ThibG <thib@sitedethib.com> | 2018-06-22 00:10:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-22 00:10:43 +0200 |
| commit | 03cfe366fd0146cb4c3ede4dcdeeb2228a513e7d (patch) | |
| tree | 4ea4874b420a859b706b1187440e2ed103800396 /app/models/concerns | |
| parent | f0161702d857a2f91d2e51469e8480253ffcd86e (diff) | |
| parent | 0c3a337e045dbd4b7be6ae6c3f07969b42f08857 (diff) | |
Merge pull request #550 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/concerns')
| -rw-r--r-- | app/models/concerns/attachmentable.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/concerns/attachmentable.rb b/app/models/concerns/attachmentable.rb index 6f8489b89..db63c3eca 100644 --- a/app/models/concerns/attachmentable.rb +++ b/app/models/concerns/attachmentable.rb @@ -41,7 +41,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' - 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 |