diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-10-22 21:10:56 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-10-22 21:10:56 +0000 |
| commit | 79670fb9753693993f5c2f42e5b3d39e51ab4f43 (patch) | |
| tree | 8e8fb91ed81115b5317da6f38b257c0760a60403 /actionpack/lib/action_controller | |
| parent | f777ff72f931983946cbccbf2c64270922e93d84 (diff) | |
| download | rails-79670fb9753693993f5c2f42e5b3d39e51ab4f43.tar.gz rails-79670fb9753693993f5c2f42e5b3d39e51ab4f43.tar.bz2 rails-79670fb9753693993f5c2f42e5b3d39e51ab4f43.zip | |
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
Diffstat (limited to 'actionpack/lib/action_controller')
| -rwxr-xr-x | actionpack/lib/action_controller/request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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: |