From 955dc38400485f7275612ac070f4168e9cf27cc8 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sat, 5 Apr 2014 15:42:53 -0400 Subject: [PATCH] Deep merge data overrides into defaults. --- lib/jekyll/convertible.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb index ab5b92cc..cce7460b 100644 --- a/lib/jekyll/convertible.rb +++ b/lib/jekyll/convertible.rb @@ -111,7 +111,7 @@ module Jekyll }] defaults = site.frontmatter_defaults.all(relative_path, type) - defaults.merge Utils.deep_merge_hashes(data, further_data) + Utils.deep_merge_hashes defaults, Utils.deep_merge_hashes(data, further_data) end def type