Skip to content

Commit

Permalink
Fixes ActionMailer regression [#3059 state:resolved]
Browse files Browse the repository at this point in the history
  • Loading branch information
wycats committed Aug 16, 2009
1 parent d6d550f commit ccf28d2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion actionpack/lib/action_view/render/rendering.rb
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def _render_inline(inline, layout, options)
template = Template.new(options[:inline], "inline #{options[:inline].inspect}", handler, {}) template = Template.new(options[:inline], "inline #{options[:inline].inspect}", handler, {})
locals = options[:locals] || {} locals = options[:locals] || {}
content = template.render(self, 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 content
end end


Expand Down

0 comments on commit ccf28d2

Please sign in to comment.