Commit 8164a6fe by James Brooks

Fixed problem when a :convert_options hash was not passed to has_attached_file

parent 7af82d25
...@@ -34,7 +34,7 @@ module Paperclip ...@@ -34,7 +34,7 @@ module Paperclip
@default_style = options[:default_style] @default_style = options[:default_style]
@storage = options[:storage] @storage = options[:storage]
@whiny_thumbnails = options[:whiny_thumbnails] @whiny_thumbnails = options[:whiny_thumbnails]
@convert_options = options[:convert_options] @convert_options = options[:convert_options] || {}
@options = options @options = options
@queued_for_delete = [] @queued_for_delete = []
@queued_for_write = {} @queued_for_write = {}
......
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