Move layout lookup to views.

2 files changed, 2 insertions, 3 deletions

diff --git a/actionpack/lib/action_controller/metal/implicit_render.rb b/actionpack/lib/action_controller/metal/implicit_render.rb
index da717fcce2..c3e3b8fdf5 100644
--- a/actionpack/lib/action_controller/metal/implicit_render.rb
+++ b/actionpack/lib/action_controller/metal/implicit_render.rb
@@ -12,8 +12,7 @@ module ActionController
 
     def method_for_action(action_name)
       super || begin
-        # TODO This should use template lookup
-        if view_paths.exists?(action_name.to_s, details_for_render, controller_path)
+        if template_exists?(action_name.to_s, :_prefix => controller_path)
           "default_render"
         end
       end
diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb
index 0a4215028b..e2d2e2312b 100644
--- a/actionpack/lib/action_controller/metal/rendering.rb
+++ b/actionpack/lib/action_controller/metal/rendering.rb
@@ -5,7 +5,7 @@ module ActionController
     include ActionController::RackDelegation
     include AbstractController::Rendering
 
-    def process_action(*)
+    def process(*)
       self.formats = request.formats.map {|x| x.to_sym }
       super
     end