aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-03-13 21:28:34 +0100
committerJosé Valim <jose.valim@gmail.com>2010-03-13 21:28:34 +0100
commit4ba334c0f4dac35b0c02cf3c4cca47d328283009 (patch)
tree67c88d5bd1693268242bd02a504f0a5233dffe86 /actionpack/lib/action_controller/metal
parentee4c89627ad5d7b041b88ab4027d3f0d5d582d8e (diff)
downloadrails-4ba334c0f4dac35b0c02cf3c4cca47d328283009.tar.gz
rails-4ba334c0f4dac35b0c02cf3c4cca47d328283009.tar.bz2
rails-4ba334c0f4dac35b0c02cf3c4cca47d328283009.zip
Ensure controller filters are executed before stuff starts to happen.
Diffstat (limited to 'actionpack/lib/action_controller/metal')
-rw-r--r--actionpack/lib/action_controller/metal/rendering.rb2
1 files changed, 1 insertions, 1 deletions
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