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:
parent
a7826bd8b7
commit
a5efd5800c
|
@ -462,7 +462,6 @@ module ActionController
|
||||||
hash_or_array_or_value.map {|i| paramify_values(i)}
|
hash_or_array_or_value.map {|i| paramify_values(i)}
|
||||||
when Rack::Test::UploadedFile, ActionDispatch::Http::UploadedFile
|
when Rack::Test::UploadedFile, ActionDispatch::Http::UploadedFile
|
||||||
hash_or_array_or_value
|
hash_or_array_or_value
|
||||||
when nil then {}
|
|
||||||
else
|
else
|
||||||
hash_or_array_or_value.to_param
|
hash_or_array_or_value.to_param
|
||||||
end
|
end
|
||||||
|
@ -495,6 +494,7 @@ module ActionController
|
||||||
|
|
||||||
@request.env['REQUEST_METHOD'] = http_method
|
@request.env['REQUEST_METHOD'] = http_method
|
||||||
|
|
||||||
|
parameters ||= {}
|
||||||
controller_class_name = @controller.class.anonymous? ?
|
controller_class_name = @controller.class.anonymous? ?
|
||||||
"anonymous" :
|
"anonymous" :
|
||||||
@controller.class.name.underscore.sub(/_controller$/, '')
|
@controller.class.name.underscore.sub(/_controller$/, '')
|
||||||
|
|
Loading…
Reference in New Issue