Commit 7ee9dfca by Henrik N Committed by Jon Yurek

Saw an issue with a nil content_type sometimes in Safari. Fix by doing to_s.

parent 93f4f3cd
...@@ -77,7 +77,7 @@ module Paperclip ...@@ -77,7 +77,7 @@ module Paperclip
logger.info("[paperclip] Writing attributes for #{name}") logger.info("[paperclip] Writing attributes for #{name}")
@queued_for_write[:original] = uploaded_file.to_tempfile @queued_for_write[:original] = uploaded_file.to_tempfile
instance_write(:file_name, uploaded_file.original_filename.strip.gsub(/[^\w\d\.\-]+/, '_')) instance_write(:file_name, uploaded_file.original_filename.strip.gsub(/[^\w\d\.\-]+/, '_'))
instance_write(:content_type, uploaded_file.content_type.strip) instance_write(:content_type, uploaded_file.content_type.to_s.strip)
instance_write(:file_size, uploaded_file.size.to_i) instance_write(:file_size, uploaded_file.size.to_i)
instance_write(:updated_at, Time.now) instance_write(:updated_at, Time.now)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment