More refactoring. Split _normalize_args and _normalize_options concerns.

1 files changed, 6 insertions, 2 deletions

diff --git a/actionpack/lib/abstract_controller/layouts.rb b/actionpack/lib/abstract_controller/layouts.rb
index c6a94c5220..648a2da795 100644
--- a/actionpack/lib/abstract_controller/layouts.rb
+++ b/actionpack/lib/abstract_controller/layouts.rb
@@ -277,8 +277,8 @@ module AbstractController
       end
     end
 
-    def render_to_body(options={})
-      if (options.keys & [:text, :inline, :partial]).empty? || options.key?(:layout)
+    def render_to_body(options)
+      if _include_layout?(options)
         layout = options.key?(:layout) ? options[:layout] : :default
         value = _layout_for_option(layout)
 
@@ -344,6 +344,10 @@ module AbstractController
       layout_name
     end
 
+    def _include_layout?(options)
+      (options.keys & [:text, :inline, :partial]).empty? || options.key?(:layout)
+    end
+
     def _action_has_layout?
       true
     end