kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Fixes ActionMailer regression [#3059 state:resolved]

Browse source
This commit is contained in:
Yehuda Katz 2009-08-15 20:38:50 -07:00
parent d6d550f0cb
commit ccf28d2499
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
actionpack/lib/action_view/render/rendering.rb
View file

@ -83,7 +83,7 @@ module ActionView
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