From 879b08a0b05c3775f365272d1983d56be667d7c2 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Fri, 12 Apr 2013 22:29:52 +0200
Subject: [PATCH] In Configuration#config_files, cascade to the Configuration's
 value of 'source' before the default

---
 lib/jekyll/configuration.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index 39cb6726..08b7dbf6 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -81,7 +81,7 @@ module Jekyll
     def config_files(override)
       # _config.yml may override default source location, but until
       # then, we need to know where to look for _config.yml
-      source = override['source'] || DEFAULTS['source']
+      source = override['source'] || self['source'] || DEFAULTS['source']
 
       # Get configuration from <source>/_config.yml or <source>/<config_file>
       config_files = override.delete('config')
@@ -127,7 +127,7 @@ module Jekyll
                      "Using defaults (and options)."
         $stderr.puts "#{err}"
       end
-      
+
       configuration
     end