1 files changed, 8 insertions, 4 deletions
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