about summary refs log tree commit diff
path: root/lib
diff options
context:
space:
mode:
authorStarfall <us@starfall.systems>2020-07-23 16:25:58 -0500
committerStarfall <us@starfall.systems>2020-07-23 16:25:58 -0500
commit2b41ed0fd69a7f7a0e17d6f0c6a421805c5e3127 (patch)
treea3ab43415b061112bc614205a3bb96bb9718bbd0 /lib
parente3d96a9bc62f57d60dc21906b4b803e346b0a738 (diff)
parent16416e940fd803af92377eee9a1756ef27eed199 (diff)
Merge branch 'glitch' into main
Diffstat (limited to 'lib')
-rw-r--r--lib/paperclip/media_type_spoof_detector_extensions.rb2
1 files changed, 1 insertions, 1 deletions
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
           ''