From e9960ea594c3b994e556c9f19f50e11955c2095d Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Tue, 26 Apr 2011 11:49:48 -0700 Subject: [PATCH] Fix support for sinatra 1.2 custom layout engines --- lib/middleman/server.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/middleman/server.rb b/lib/middleman/server.rb index e4a21927..b2e4b57a 100644 --- a/lib/middleman/server.rb +++ b/lib/middleman/server.rb @@ -147,7 +147,10 @@ module Middleman settings.layout(options[:layout]) if !options[:layout].nil? layout = settings.fetch_layout_path.to_sym 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) if result