diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-05-26 11:34:02 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-05-26 11:34:02 -0300 |
| commit | b3d40546923b194a89be0d9e00758864fa60b9e8 (patch) | |
| tree | 8acac475b371d61924c67a439704c82c61968fff /actionpack/lib/action_controller/abstract/base.rb | |
| parent | aa5512299041efb923cd582fd26009a72b9ec670 (diff) | |
| parent | 2f59066470193c6219dfd958fc5d8096a2ddee68 (diff) | |
| download | rails-b3d40546923b194a89be0d9e00758864fa60b9e8.tar.gz rails-b3d40546923b194a89be0d9e00758864fa60b9e8.tar.bz2 rails-b3d40546923b194a89be0d9e00758864fa60b9e8.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/lib/action_controller/abstract/base.rb')
| -rw-r--r-- | actionpack/lib/action_controller/abstract/base.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/abstract/base.rb b/actionpack/lib/action_controller/abstract/base.rb index 1f2f096dae..0e4803388a 100644 --- a/actionpack/lib/action_controller/abstract/base.rb +++ b/actionpack/lib/action_controller/abstract/base.rb @@ -68,11 +68,11 @@ module AbstractController self.response_obj = {} end - def process(action_name) - @_action_name = action_name = action_name.to_s + def process(action) + @_action_name = action_name = action.to_s unless action_name = method_for_action(action_name) - raise ActionNotFound, "The action '#{action_name}' could not be found" + raise ActionNotFound, "The action '#{action}' could not be found" end process_action(action_name) |