Merge commit 'mainstream/master'

1 files changed, 5 insertions, 5 deletions

diff --git a/actionpack/lib/action_view/paths.rb b/actionpack/lib/action_view/paths.rb
index 074b475819..4001757a9b 100644
--- a/actionpack/lib/action_view/paths.rb
+++ b/actionpack/lib/action_view/paths.rb
@@ -33,12 +33,12 @@ module ActionView #:nodoc:
       super(*objs.map { |obj| self.class.type_cast(obj) })
     end
 
-    def find_by_parts(path, details = {}, prefix = nil, partial = false)
+    def find(path, details = {}, prefix = nil, partial = false)
       # template_path = path.sub(/^\//, '')
       template_path = path
 
       each do |load_path|
-        if template = load_path.find_by_parts(template_path, details, prefix, partial)
+        if template = load_path.find(template_path, details, prefix, partial)
           return template
         end
       end
@@ -48,11 +48,11 @@ module ActionView #:nodoc:
       raise ActionView::MissingTemplate.new(self, "#{prefix}/#{path} - #{details.inspect} - partial: #{!!partial}")
     end
     
-    def find_by_parts?(path, extension = nil, prefix = nil, partial = false)
+    def exists?(path, extension = nil, prefix = nil, partial = false)
       template_path = path.sub(/^\//, '')
 
       each do |load_path|
-        return true if template = load_path.find_by_parts(template_path, extension, prefix, partial)
+        return true if template = load_path.find(template_path, extension, prefix, partial)
       end      
       false
     end
@@ -62,7 +62,7 @@ module ActionView #:nodoc:
       template_path = original_template_path.sub(/^\//, '')
 
       each do |load_path|
-        if template = load_path.find_by_parts(template_path, format)
+        if template = load_path.find(template_path, format)
           return template
         # Try to find html version if the format is javascript
         elsif format == :js && html_fallback && template = load_path["#{template_path}.#{I18n.locale}.html"]