github/jekyll
1
1
Fork 0
mirror of https://github.com/jekyll/jekyll.git synced 2026-01-31 17:58:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

Deep merge data overrides into defaults.

Browse Source
This commit is contained in:
Parker Moore
2014-04-05 15:42:53 -04:00
parent 09c6ff4f9c
commit 955dc38400
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/jekyll/convertible.rb
View File

@@ -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