Deep merge data overrides into defaults.

2014-04-05 15:42:53 -04:00 · 2014-04-05 15:42:53 -04:00 · 955dc38400
parent 09c6ff4f9c
commit 955dc38400
1 changed files with 1 additions and 1 deletions
--- 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