dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

In Configuration#config_files, cascade to the Configuration's value of 'source' before the default

This commit is contained in:
Parker Moore 2013-04-12 22:29:52 +02:00
parent 0812c1b4c9
commit 879b08a0b0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/jekyll/configuration.rb
View File

@ -81,7 +81,7 @@ module Jekyll
def config_files(override) def config_files(override)
# _config.yml may override default source location, but until # _config.yml may override default source location, but until
# then, we need to know where to look for _config.yml # 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> # Get configuration from <source>/_config.yml or <source>/<config_file>
config_files = override.delete('config') config_files = override.delete('config')
@ -127,7 +127,7 @@ module Jekyll
"Using defaults (and options)." "Using defaults (and options)."
$stderr.puts "#{err}" $stderr.puts "#{err}"
end end
configuration configuration
end end