From ccf28d2499d1b4e2aba41291eb800e0e02120923 Mon Sep 17 00:00:00 2001 From: Yehuda Katz Date: Sat, 15 Aug 2009 20:38:50 -0700 Subject: Fixes ActionMailer regression [#3059 state:resolved] --- actionpack/lib/action_view/render/rendering.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionpack') diff --git a/actionpack/lib/action_view/render/rendering.rb b/actionpack/lib/action_view/render/rendering.rb index e04800e6e8..b0b75918b7 100644 --- a/actionpack/lib/action_view/render/rendering.rb +++ b/actionpack/lib/action_view/render/rendering.rb @@ -83,7 +83,7 @@ module ActionView template = Template.new(options[:inline], "inline #{options[:inline].inspect}", handler, {}) locals = options[:locals] || {} content = template.render(self, locals) - content = layout.render(self, locals) {|*name| _layout_for(*name) } if layout + content = layout.render(self, locals) {|*name| _layout_for(*name) { content } } if layout content end -- cgit v1.2.3