From f08b58dd0c0ad860bb119bde94a46c6330ca1556 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim=20=26=20Carlos=20Antonio=20da=20Silva?= <carlos+jose@plataformatec.com.br> Date: Wed, 11 Aug 2010 10:23:07 -0300 Subject: layout_for works again with objects as specified in the documentation and Rails 2.3 [#5357 state:resolved] --- actionpack/lib/action_view/render/layouts.rb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'actionpack/lib') diff --git a/actionpack/lib/action_view/render/layouts.rb b/actionpack/lib/action_view/render/layouts.rb index a474783a20..8882acca31 100644 --- a/actionpack/lib/action_view/render/layouts.rb +++ b/actionpack/lib/action_view/render/layouts.rb @@ -47,11 +47,15 @@ module ActionView # Hello David # </html> # - def _layout_for(name = nil, &block) #:nodoc: - if !block || name - @_content_for[name || :layout].html_safe + def _layout_for(*args, &block) #:nodoc: + name = args.first + + if name.is_a?(Symbol) + @_content_for[name].html_safe + elsif block + capture(*args, &block) else - capture(&block) + @_content_for[:layout].html_safe end end -- cgit v1.2.3