diff options
| author | Yehuda Katz <wycats@gmail.com> | 2009-08-15 20:38:50 -0700 |
|---|---|---|
| committer | Yehuda Katz <wycats@gmail.com> | 2009-08-15 20:38:50 -0700 |
| commit | ccf28d2499d1b4e2aba41291eb800e0e02120923 (patch) | |
| tree | 86dd3250d37c1e09b055c0292fb293031ea15f56 /actionpack | |
| parent | d6d550f0cbbe37fc8caf851e9143749f2fa5cd38 (diff) | |
| download | rails-ccf28d2499d1b4e2aba41291eb800e0e02120923.tar.gz rails-ccf28d2499d1b4e2aba41291eb800e0e02120923.tar.bz2 rails-ccf28d2499d1b4e2aba41291eb800e0e02120923.zip | |
Fixes ActionMailer regression [#3059 state:resolved]
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_view/render/rendering.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |