Permalink
Browse files

Make action_has_layout? non-private

  • Loading branch information...
1 parent 3deb60e commit d8c7efece60f23d09031c11928be5048ac6340de Carlhuda committed Mar 18, 2010
Showing with 4 additions and 4 deletions.
  1. +4 −4 actionpack/lib/abstract_controller/layouts.rb
@@ -184,7 +184,7 @@ module LayoutConditions
#
# ==== 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 @@ def _layout_for_option(name)
# 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 @@ def _include_layout?(options)
(options.keys & [:text, :inline, :partial]).empty? || options.key?(:layout)
end
- def _action_has_layout?
+ def action_has_layout?
true
end
end

0 comments on commit d8c7efe

Please sign in to comment.