Permalink
Browse files

Fixes problem when no s3 headers are defined

  • Loading branch information...
1 parent 8be77a9 commit adabe469d87eadf779cd215d808ee3ebaabb86fd @jonberke jonberke committed with jyurek Nov 17, 2012
Showing with 1 addition and 0 deletions.
  1. +1 −0 lib/paperclip/storage/s3.rb
@@ -373,6 +373,7 @@ def use_secure_protocol?(style_name)
end
def merge_s3_headers(http_headers, s3_headers, s3_metadata)
+ return if http_headers.nil?
http_headers = http_headers.call(instance) if http_headers.respond_to?(:call)
http_headers.inject({}) do |headers,(name,value)|
case name.to_s

0 comments on commit adabe46

Please sign in to comment.