diff options
Diffstat (limited to 'actionpack/lib')
-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: |