From bd8d271ce3153a1bf49223dfc3380ea079fc969b Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 12 Apr 2013 23:11:38 +0200 Subject: [PATCH] Moving the backwards-compatibilizing to Configuration#read_config_files. @mattr- --- lib/jekyll.rb | 1 - lib/jekyll/configuration.rb | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/jekyll.rb b/lib/jekyll.rb index fad6c769..78572491 100644 --- a/lib/jekyll.rb +++ b/lib/jekyll.rb @@ -67,7 +67,6 @@ module Jekyll config = Configuration[Configuration::DEFAULTS] override = Configuration[override].stringify_keys config = config.read_config_files(config.config_files(override)) - config = config.backwards_compatibilize # Merge DEFAULTS < _config.yml < override config.deep_merge(override).stringify_keys diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb index 08b7dbf6..619b33ae 100644 --- a/lib/jekyll/configuration.rb +++ b/lib/jekyll/configuration.rb @@ -128,7 +128,7 @@ module Jekyll $stderr.puts "#{err}" end - configuration + configuration.backwards_compatibilize end # Public: Ensure the proper options are set in the configuration to allow for