Don't leave @default_layout set to false if rendering a template fails.

sinatra · Oct 14, 2011 · 4384dda · 4384dda
1 parent a25bff1
commit 4384dda
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/lib/sinatra/base.rb b/lib/sinatra/base.rb
@@ -568,11 +568,14 @@ def render(engine, data, options={}, locals={}, &block)
       scope           = options.delete(:scope)         || self
 
       # compile and render template
-      layout_was      = @default_layout
+      begin
-      @default_layout = false
+        layout_was      = @default_layout
-      template        = compile_template(engine, data, options, views)
+        @default_layout = false
-      output          = template.render(scope, locals, &block)
+        template        = compile_template(engine, data, options, views)
-      @default_layout = layout_was
+        output          = template.render(scope, locals, &block)
+      ensure
+        @default_layout = layout_was
+      end
 
       # render layout
       if layout