From 4ba334c0f4dac35b0c02cf3c4cca47d328283009 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sat, 13 Mar 2010 21:28:34 +0100
Subject: Ensure controller filters are executed before stuff starts to happen.

---
 actionpack/lib/action_controller/metal/rendering.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/lib/action_controller/metal')

diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb
index 2167fe9a32..86bb810947 100644
--- a/actionpack/lib/action_controller/metal/rendering.rb
+++ b/actionpack/lib/action_controller/metal/rendering.rb
@@ -6,7 +6,7 @@ module ActionController
     include AbstractController::Rendering
 
     # Before processing, set the request formats in current controller formats.
-    def process(*) #:nodoc:
+    def process_action(*) #:nodoc:
       self.formats = request.formats.map { |x| x.to_sym }
       super
     end
-- 
cgit v1.2.3