Fixed 'type' being nil on Windows 7 error.

6f2ca932 · simonjsmithuk · Jon Yurek · ad45c0f0 · 6f2ca932
Commit 6f2ca932 authored Oct 04, 2012 by simonjsmithuk Committed by Jon Yurek Nov 02, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

lib/paperclip/content_type_detector.rb
+1 -1

No files found.
--- a/lib/paperclip/content_type_detector.rb
+++ b/lib/paperclip/content_type_detector.rb
@@ -57,7 +57,7 @@ module Paperclip
        SENSIBLE_DEFAULT
      end

-      if type.match(/\(.*?\)/)
+      if type.nil? || type.match(/\(.*?\)/)
        type = SENSIBLE_DEFAULT
      end
      type.split(/[:;\s]+/)[0]