From d8c7efece60f23d09031c11928be5048ac6340de Mon Sep 17 00:00:00 2001
From: Carlhuda <carlhuda@engineyard.com>
Date: Thu, 18 Mar 2010 13:47:40 -0700
Subject: Make action_has_layout? non-private

---
 actionpack/lib/abstract_controller/layouts.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'actionpack/lib/abstract_controller/layouts.rb')

diff --git a/actionpack/lib/abstract_controller/layouts.rb b/actionpack/lib/abstract_controller/layouts.rb
index 528a430b04..24a3923447 100644
--- a/actionpack/lib/abstract_controller/layouts.rb
+++ b/actionpack/lib/abstract_controller/layouts.rb
@@ -184,7 +184,7 @@ module AbstractController
         #
         # ==== Returns
         # Boolean:: True if the action has a layout, false otherwise.
-        def _action_has_layout?
+        def action_has_layout?
           conditions = _layout_conditions
 
           if only = conditions[:only]
@@ -336,13 +336,13 @@ module AbstractController
     # Template:: The template object for the default layout (or nil)
     def _default_layout(require_layout = false)
       begin
-        layout_name = _layout if _action_has_layout?
+        layout_name = _layout if action_has_layout?
       rescue NameError => e
         raise NoMethodError,
           "You specified #{@_layout.inspect} as the layout, but no such method was found"
       end
 
-      if require_layout && _action_has_layout? && !layout_name
+      if require_layout && action_has_layout? && !layout_name
         raise ArgumentError,
           "There was no default layout for #{self.class} in #{view_paths.inspect}"
       end
@@ -354,7 +354,7 @@ module AbstractController
       (options.keys & [:text, :inline, :partial]).empty? || options.key?(:layout)
     end
 
-    def _action_has_layout?
+    def action_has_layout?
       true
     end
   end
-- 
cgit v1.2.3