From 79670fb9753693993f5c2f42e5b3d39e51ab4f43 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Mon, 22 Oct 2007 21:10:56 +0000 Subject: request.parameters doesn't overwrite request.request_parameters. Closes #9949 [nullstyle] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7992 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/request.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionpack/lib/action_controller') diff --git a/actionpack/lib/action_controller/request.rb b/actionpack/lib/action_controller/request.rb index 1fa6accd01..935e3e08ae 100755 --- a/actionpack/lib/action_controller/request.rb +++ b/actionpack/lib/action_controller/request.rb @@ -275,7 +275,7 @@ module ActionController # Returns both GET and POST parameters in a single hash. def parameters - @parameters ||= request_parameters.update(query_parameters).update(path_parameters).with_indifferent_access + @parameters ||= request_parameters.merge(query_parameters).update(path_parameters).with_indifferent_access end def path_parameters=(parameters) #:nodoc: -- cgit v1.2.3