From 9278eb8fcec85b17573c6658d7d67ef6ea6ffb92 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Wed, 22 Jun 2016 12:15:07 -0700
Subject: [PATCH] utils: check that the object is a hash when merging
 default_proc

Follow-up to #5026.
---
 lib/jekyll/utils.rb | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb
index ca9e6fba..1f0af762 100644
--- a/lib/jekyll/utils.rb
+++ b/lib/jekyll/utils.rb
@@ -302,16 +302,11 @@ module Jekyll
 
     private
     def merge_default_proc(target, overwrite)
-      if default_proc?(target) && default_proc?(overwrite) && target.default_proc.nil?
+      if target.is_a?(Hash) && overwrite.is_a?(Hash) && target.default_proc.nil?
         target.default_proc = overwrite.default_proc
       end
     end
 
-    private
-    def default_proc?(object)
-      object.respond_to?(:default_proc)
-    end
-
     private
     def duplicate_frozen_values(target)
       target.each do |key, val|