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

Fix support for sinatra 1.2 custom layout engines

Browse source
This commit is contained in:
Thomas Reynolds 2011-04-26 11:49:48 -07:00
parent 16ffd59ef9
commit e9960ea594
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/middleman/server.rb
View file

@ -147,7 +147,10 @@ module Middleman
settings.layout(options[:layout]) if !options[:layout].nil? settings.layout(options[:layout]) if !options[:layout].nil?
layout = settings.fetch_layout_path.to_sym layout = settings.fetch_layout_path.to_sym
layout = false if options[:layout] == false or path =~ /\.(css|js)$/ layout = false if options[:layout] == false or path =~ /\.(css|js)$/
result = render(path, :layout => layout, :layout_engine => options[:layout_engine])
render_options = { :layout => layout }
render_options[:layout_engine] = options[:layout_engine] if options.has_key? :layout_engine
result = render(path, render_options)
settings.layout(old_layout) settings.layout(old_layout)
if result if result