]> cat aescling's git repositories - mastodon.git/commitdiff
Fix mimetype returning nil (#14356)
authorTakeshi Umeda <noel.yoshiba@gmail.com>
Sun, 19 Jul 2020 11:09:47 +0000 (20:09 +0900)
committerGitHub <noreply@github.com>
Sun, 19 Jul 2020 11:09:47 +0000 (13:09 +0200)
lib/paperclip/media_type_spoof_detector_extensions.rb

index 363934d8d1395df9902f2779e6dcf4438315d869..43337cc6884222af8e5b61f4be9a65f71d3aa26b 100644 (file)
@@ -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
           ''