Merge commit 'rails/master'

Conflicts:
	activerecord/lib/active_record/associations.rb

1 files changed, 10 insertions, 4 deletions

diff --git a/actionpack/lib/abstract_controller/rendering_controller.rb b/actionpack/lib/abstract_controller/rendering_controller.rb
index feca1bc4b7..bbf941aa32 100644
--- a/actionpack/lib/abstract_controller/rendering_controller.rb
+++ b/actionpack/lib/abstract_controller/rendering_controller.rb
@@ -112,12 +112,18 @@ module AbstractController
       name = (options[:_template_name] || action_name).to_s
 
       options[:_template] ||= with_template_cache(name) do
-        view_paths.find(
-          name, { :formats => formats }, options[:_prefix], options[:_partial]
-        )
+        find_template(name, { :formats => formats }, options)
       end
     end
-    
+
+    def find_template(name, details, options)
+      view_paths.find(name, details, options[:_prefix], options[:_partial])
+    end
+
+    def template_exists?(name, details, options)
+      view_paths.exists?(name, details, options[:_prefix], options[:_partial])
+    end
+
     def with_template_cache(name)
       yield
     end