kotovalexarian-likes-github
/
sinatra
mirror of https://github.com/sinatra/sinatra
1
0
Fork 0
Code Releases Activity

Merge pull request #388 from nbaum/master 

Don't leave @default_layout set to false if rendering a template fails
This commit is contained in:
Konstantin Haase 2011-10-14 08:42:39 -07:00
parent 4c6b1fadb5 313def15ee
commit 2a9e7b60df
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/sinatra/base.rb
View File

@ -619,11 +619,14 @@ module Sinatra
scope = options.delete(:scope) || self
# compile and render template
layout_was = @default_layout
@default_layout = false
template = compile_template(engine, data, options, views)
output = template.render(scope, locals, &block)
@default_layout = layout_was
begin
layout_was = @default_layout
@default_layout = false
template = compile_template(engine, data, options, views)
output = template.render(scope, locals, &block)
ensure
@default_layout = layout_was
end
# render layout
if layout