aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/abstract/callbacks.rb
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2009-05-16 17:13:58 +0200
committerPratik Naik <pratiknaik@gmail.com>2009-05-16 17:13:58 +0200
commit6be72a1e6287c5c098dd518ddc0467e473164869 (patch)
tree89e7f6bf9ff6b7cf1ed5f2424991dc472e6a2c24 /actionpack/lib/action_controller/abstract/callbacks.rb
parentc8fb22bc2933beb5c6cc4113380c8faf77d87ffe (diff)
parenta6d8ca0f0e65ce509793713cb1efe4ab721b9eb4 (diff)
downloadrails-6be72a1e6287c5c098dd518ddc0467e473164869.tar.gz
rails-6be72a1e6287c5c098dd518ddc0467e473164869.tar.bz2
rails-6be72a1e6287c5c098dd518ddc0467e473164869.zip
Merge commit 'mainstream/master'
Diffstat (limited to 'actionpack/lib/action_controller/abstract/callbacks.rb')
-rw-r--r--actionpack/lib/action_controller/abstract/callbacks.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/abstract/callbacks.rb b/actionpack/lib/action_controller/abstract/callbacks.rb
index 3aff83a209..51b968c694 100644
--- a/actionpack/lib/action_controller/abstract/callbacks.rb
+++ b/actionpack/lib/action_controller/abstract/callbacks.rb
@@ -8,8 +8,8 @@ module AbstractController
define_callbacks :process_action, "response_body"
end
- def process_action
- _run_process_action_callbacks(action_name) do
+ def process_action(method_name)
+ _run_process_action_callbacks(method_name) do
super
end
end