Revert "push parameter instantiation to one method"

This reverts commit 9669f6f788.

This breaks Sam Ruby's tests for some reason.  Revert until we figure it
out.
This commit is contained in:
Aaron Patterson 2012-07-05 15:46:14 -07:00
parent a7826bd8b7
commit a5efd5800c
1 changed files with 1 additions and 1 deletions

View File

@ -462,7 +462,6 @@ module ActionController
hash_or_array_or_value.map {|i| paramify_values(i)}
when Rack::Test::UploadedFile, ActionDispatch::Http::UploadedFile
hash_or_array_or_value
when nil then {}
else
hash_or_array_or_value.to_param
end
@ -495,6 +494,7 @@ module ActionController
@request.env['REQUEST_METHOD'] = http_method
parameters ||= {}
controller_class_name = @controller.class.anonymous? ?
"anonymous" :
@controller.class.name.underscore.sub(/_controller$/, '')