aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorYehuda Katz <wycats@gmail.com>2009-07-11 23:39:45 -0400
committerYehuda Katz <wycats@gmail.com>2009-07-11 23:40:36 -0400
commitb0429f5e66b4e33f9d0ba7b066a3dbfdab68534c (patch)
tree51ef30331b604e6b8554a72b4c20911263310710 /actionpack/lib/action_controller
parentc863388039ff6e97447be86184d41fbf30f0f389 (diff)
downloadrails-b0429f5e66b4e33f9d0ba7b066a3dbfdab68534c.tar.gz
rails-b0429f5e66b4e33f9d0ba7b066a3dbfdab68534c.tar.bz2
rails-b0429f5e66b4e33f9d0ba7b066a3dbfdab68534c.zip
Rename method to a more obvious name
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/abstract/layouts.rb4
-rw-r--r--actionpack/lib/action_controller/base/compatibility.rb4
2 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/abstract/layouts.rb b/actionpack/lib/action_controller/abstract/layouts.rb
index 2ac4e6068a..d8276cfa83 100644
--- a/actionpack/lib/action_controller/abstract/layouts.rb
+++ b/actionpack/lib/action_controller/abstract/layouts.rb
@@ -99,7 +99,7 @@ module AbstractController
# the lookup to. By default, layout lookup is limited to the
# formats specified for the current request.
def _layout_for_name(name, details = {:formats => formats})
- name && _find_by_parts(name, details)
+ name && _find_layout(name, details)
end
# Take in the name and details and find a Template.
@@ -111,7 +111,7 @@ module AbstractController
#
# ==== Returns
# Template:: A template object matching the name and details
- def _find_by_parts(name, details)
+ def _find_layout(name, details)
# TODO: Make prefix actually part of details in ViewPath#find_by_parts
prefix = details.key?(:prefix) ? details.delete(:prefix) : "layouts"
view_paths.find_by_parts(name, details, prefix)
diff --git a/actionpack/lib/action_controller/base/compatibility.rb b/actionpack/lib/action_controller/base/compatibility.rb
index cd4b72b1c6..13813ffd17 100644
--- a/actionpack/lib/action_controller/base/compatibility.rb
+++ b/actionpack/lib/action_controller/base/compatibility.rb
@@ -114,7 +114,7 @@ module ActionController
super || (respond_to?(:method_missing) && "_handle_method_missing")
end
- def _find_by_parts(name, details)
+ def _find_layout(name, details)
details[:prefix] = nil if name =~ /\blayouts/
super
end
@@ -123,7 +123,7 @@ module ActionController
def _default_layout(details, require_layout = false)
super
rescue ActionView::MissingTemplate
- _find_by_parts(_layout({}), {})
+ _find_layout(_layout({}), {})
nil
end