Merge deep
This commit is contained in:
parent
579d9fc813
commit
5f807e7421
|
@ -41,10 +41,10 @@ module Jekyll
|
|||
old_scope = nil
|
||||
matching_sets(path, type).each do |set|
|
||||
if has_precedence?(old_scope, set['scope'])
|
||||
defaults.merge! set['values']
|
||||
defaults.deep_merge! set['values']
|
||||
old_scope = set['scope']
|
||||
else
|
||||
defaults = set['values'].merge(defaults)
|
||||
defaults = set['values'].deep_merge(defaults)
|
||||
end
|
||||
end
|
||||
defaults
|
||||
|
@ -145,4 +145,4 @@ module Jekyll
|
|||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue