diff options
| author | Yehuda Katz <wycats@gmail.com> | 2009-08-08 12:26:58 -0300 |
|---|---|---|
| committer | Yehuda Katz <wycats@gmail.com> | 2009-08-08 12:44:26 -0300 |
| commit | d0301e13f4d6e2ddf956ecf80e85384c1ea5346c (patch) | |
| tree | 3123d73744b834834579bf1996e0c286952c110c /actionpack/lib/action_view/render/rendering.rb | |
| parent | a8645593a4446a89b2e699e153adca968340581a (diff) | |
| download | rails-d0301e13f4d6e2ddf956ecf80e85384c1ea5346c.tar.gz rails-d0301e13f4d6e2ddf956ecf80e85384c1ea5346c.tar.bz2 rails-d0301e13f4d6e2ddf956ecf80e85384c1ea5346c.zip | |
First pass at making partial rendering an Object. More cleanup to come.
Diffstat (limited to 'actionpack/lib/action_view/render/rendering.rb')
| -rw-r--r-- | actionpack/lib/action_view/render/rendering.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/render/rendering.rb b/actionpack/lib/action_view/render/rendering.rb index 742b965556..c7afc56e3b 100644 --- a/actionpack/lib/action_view/render/rendering.rb +++ b/actionpack/lib/action_view/render/rendering.rb @@ -20,8 +20,7 @@ module ActionView if block_given? return concat(_render_partial(options.merge(:partial => layout), &block)) elsif options.key?(:partial) - layout = _pick_partial_template(layout) if layout - return _render_content(_render_partial(options), layout, options[:locals]) + return _render_partial(options) end layout = find(layout, {:formats => formats}) if layout |