diff options
| author | Andrew White <andyw@pixeltrix.co.uk> | 2011-03-23 23:09:00 +0000 |
|---|---|---|
| committer | Andrew White <andyw@pixeltrix.co.uk> | 2011-03-23 23:32:44 +0000 |
| commit | 9772de8d459960cc114c5b214343b7ce08fea21c (patch) | |
| tree | d103db091da987a1af5b3d01d1e7719c260e3927 /actionpack/lib | |
| parent | 5da9a74bd35284cf5124793c1f7558e506b52592 (diff) | |
| download | rails-9772de8d459960cc114c5b214343b7ce08fea21c.tar.gz rails-9772de8d459960cc114c5b214343b7ce08fea21c.tar.bz2 rails-9772de8d459960cc114c5b214343b7ce08fea21c.zip | |
Fix filter :only and :except with implicit actions
The method_name argument is "default_render" for implicit actions
so use the action_name attribute to determine which callbacks to run.
[#5673 state:resolved]
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/abstract_controller/callbacks.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/abstract_controller/callbacks.rb b/actionpack/lib/abstract_controller/callbacks.rb index 95992c2698..1943ca4436 100644 --- a/actionpack/lib/abstract_controller/callbacks.rb +++ b/actionpack/lib/abstract_controller/callbacks.rb @@ -14,7 +14,7 @@ module AbstractController # Override AbstractController::Base's process_action to run the # process_action callbacks around the normal behavior. def process_action(method_name, *args) - run_callbacks(:process_action, method_name) do + run_callbacks(:process_action, action_name) do super end end |