aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/abstract/base.rb
diff options
context:
space:
mode:
authorYehuda Katz <wycats@yehuda-katzs-macbookpro41.local>2009-05-23 00:39:32 -0700
committerYehuda Katz <wycats@yehuda-katzs-macbookpro41.local>2009-05-23 00:39:32 -0700
commite22a3d893ef8441fb52320315c5e348c6c208b69 (patch)
treeefdbc4f2bece84bf500284a4a8dce9a7ef839324 /actionpack/lib/action_controller/abstract/base.rb
parent3ac6d8f8b01fb04b8d6d35d75d802b41f4c256c9 (diff)
downloadrails-e22a3d893ef8441fb52320315c5e348c6c208b69.tar.gz
rails-e22a3d893ef8441fb52320315c5e348c6c208b69.tar.bz2
rails-e22a3d893ef8441fb52320315c5e348c6c208b69.zip
Slightly modify things to get content type matching working without breaking other code
Diffstat (limited to 'actionpack/lib/action_controller/abstract/base.rb')
-rw-r--r--actionpack/lib/action_controller/abstract/base.rb6
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)