deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Move more things over to new configs. Don't let root be configured

Browse source
This commit is contained in:
Ben Hollis 2012-10-13 22:37:24 -07:00
parent a50ca56fbc
commit 4fe22e3fb5
14 changed files with 42 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

2
middleman-core/lib/middleman-core/core_extensions/rendering.rb
View file

@ -272,7 +272,7 @@ module Middleman
# @return [String]
def fetch_layout(engine, opts)
# The layout name comes from either the system default or the options
local_layout = opts.has_key?(:layout) ? opts[:layout] : layout
local_layout = opts.has_key?(:layout) ? opts[:layout] : config[:layout]
return false unless local_layout
# Look for engine-specific options