diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2015-10-29 16:18:12 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2015-10-29 16:18:27 -0700 |
| commit | 8941831733fc56e2b1872f41c85cc48d782bb984 (patch) | |
| tree | 5676856877440afe688652530fd5e5f2359b598b /actionpack/lib | |
| parent | 21a386bb0726cce4f4a5d64d55fbb55d8a2b9837 (diff) | |
| download | rails-8941831733fc56e2b1872f41c85cc48d782bb984.tar.gz rails-8941831733fc56e2b1872f41c85cc48d782bb984.tar.bz2 rails-8941831733fc56e2b1872f41c85cc48d782bb984.zip | |
Revert "ActionController::Base#process() now only takes an action name"
This reverts commit 9f93a5efbba3e1cbf0bfa700a17ec8d1ef60d7c6.
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/abstract_controller/base.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/abstract_controller/base.rb b/actionpack/lib/abstract_controller/base.rb index c27b7b3836..4501202b8c 100644 --- a/actionpack/lib/abstract_controller/base.rb +++ b/actionpack/lib/abstract_controller/base.rb @@ -116,7 +116,7 @@ module AbstractController # # ==== Returns # * <tt>self</tt> - def process(action) + def process(action, *args) @_action_name = action.to_s unless action_name = _find_action_name(@_action_name) @@ -125,7 +125,7 @@ module AbstractController @_response_body = nil - process_action(action_name) + process_action(action_name, *args) end # Delegates to the class' ::controller_path |