Skip to content

Commit

Permalink
Utils: deep_merge_hashes should also merge default_proc
Browse files Browse the repository at this point in the history
If the target hash's default_proc isn't set, overwrite with the new hash's default_proc.

/cc #4064
  • Loading branch information
parkr committed Oct 27, 2015
1 parent 170d6de commit 45f69bb
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions lib/jekyll/utils.rb
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ def deep_merge_hashes!(target, overwrite)
target[key] = overwrite[key]
end

if target.default_proc.nil?
target.default_proc = overwrite.default_proc
end

target
end

Expand Down

0 comments on commit 45f69bb

Please sign in to comment.