From: Takeshi Umeda <noel.yoshiba@gmail.com>
Date: Sun, 19 Jul 2020 11:09:47 +0000 (+0900)
Subject: Fix mimetype returning nil (#14356)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=101485a41fb2ea326496142d9ccb368522cbe0f0;p=mastodon.git

Fix mimetype returning nil (#14356)
---

diff --git a/lib/paperclip/media_type_spoof_detector_extensions.rb b/lib/paperclip/media_type_spoof_detector_extensions.rb
index 363934d8d..43337cc68 100644
--- a/lib/paperclip/media_type_spoof_detector_extensions.rb
+++ b/lib/paperclip/media_type_spoof_detector_extensions.rb
@@ -18,7 +18,7 @@ module Paperclip
       @type_from_mime_magic ||= begin
         begin
           File.open(@file.path) do |file|
-            MimeMagic.by_magic(file)&.type
+            MimeMagic.by_magic(file)&.type || ''
           end
         rescue Errno::ENOENT
           ''