From f52a0e7200957362d8078adc3c15cda303543e43 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 8 Apr 2016 10:49:08 -0700 Subject: [PATCH] Configuration#add_default_collections: fix bug where DEFAULTS['collections'] is modified --- lib/jekyll/configuration.rb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb index 4af19a63..03547604 100644 --- a/lib/jekyll/configuration.rb +++ b/lib/jekyll/configuration.rb @@ -297,11 +297,13 @@ module Jekyll config['collections'] = Hash[config['collections'].map { |c| [c, {}] }] end - # Add posts. - config['collections']['posts'] ||= {} - config['collections']['posts']['output'] = true - if config['permalink'] - config['collections']['posts']['permalink'] ||= style_to_permalink(config['permalink']) + config['collections'] = Utils.deep_merge_hashes( + { 'posts' => {} }, config['collections'] + ).tap do |collections| + collections['posts']['output'] = true + if config['permalink'] + collections['posts']['permalink'] ||= style_to_permalink(config['permalink']) + end end config