Skip to content

P
paperclip
Commit adabe469 by Jon Berke Committed by Jon Yurek
Options

Fixes problem when no s3 headers are defined

parent 8be77a91
Showing with 1 additions and 0 deletions
lib/paperclip/storage/s3.rb
...@@ -373,6 +373,7 @@ module Paperclip ...@@ -373,6 +373,7 @@ module Paperclip
end end
def merge_s3_headers(http_headers, s3_headers, s3_metadata) 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 = http_headers.call(instance) if http_headers.respond_to?(:call)
http_headers.inject({}) do |headers,(name,value)| http_headers.inject({}) do |headers,(name,value)|
case name.to_s case name.to_s
......
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