diff options
| author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-04-29 16:33:24 -0700 |
|---|---|---|
| committer | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-01 17:31:01 -0700 |
| commit | 0c3d9bc4c2b329cb754bfed1e465f99d058e1193 (patch) | |
| tree | 1ef1697cfe82c714549e4367a3ce63e928a4e04e /actionpack/lib/action_controller/abstract/layouts.rb | |
| parent | 4f68311685831b940936130203c240fa23525c84 (diff) | |
| download | rails-0c3d9bc4c2b329cb754bfed1e465f99d058e1193.tar.gz rails-0c3d9bc4c2b329cb754bfed1e465f99d058e1193.tar.bz2 rails-0c3d9bc4c2b329cb754bfed1e465f99d058e1193.zip | |
Ported over render :template tests
Diffstat (limited to 'actionpack/lib/action_controller/abstract/layouts.rb')
| -rw-r--r-- | actionpack/lib/action_controller/abstract/layouts.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/abstract/layouts.rb b/actionpack/lib/action_controller/abstract/layouts.rb index 315d6151e9..f56b9dd914 100644 --- a/actionpack/lib/action_controller/abstract/layouts.rb +++ b/actionpack/lib/action_controller/abstract/layouts.rb @@ -50,8 +50,7 @@ module AbstractController end def _render_template(template, options) - # layout = options[:_layout].is_a?(ActionView::Template) ? options[:_layout] : _layout_for_name(options[:_layout]) - _action_view._render_template_with_layout(template, options[:_layout]) + _action_view._render_template_with_layout(template, options[:_layout], options) end private |