diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2006-03-18 16:11:21 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-03-18 16:11:21 +0000 |
| commit | c2fb8ca393569105cb25bd79d1bf018c20cce51a (patch) | |
| tree | 033633a7781a0c8b5d71deac462d8e0c5abbe949 | |
| parent | 7bfca7e717aca77ab8dcc629c55abe71f2e5e4bd (diff) | |
| download | rails-c2fb8ca393569105cb25bd79d1bf018c20cce51a.tar.gz rails-c2fb8ca393569105cb25bd79d1bf018c20cce51a.tar.bz2 rails-c2fb8ca393569105cb25bd79d1bf018c20cce51a.zip | |
Just use a normal update on the indifferent hash
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3927 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rw-r--r-- | actionpack/lib/action_controller/components.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/components.rb b/actionpack/lib/action_controller/components.rb index a9c850c49d..3ea83463e3 100644 --- a/actionpack/lib/action_controller/components.rb +++ b/actionpack/lib/action_controller/components.rb @@ -153,7 +153,7 @@ module ActionController #:nodoc: request.instance_variable_set( :@parameters, - (options[:params] || {}).with_indifferent_access.regular_update( + (options[:params] || {}).with_indifferent_access.update( "controller" => controller_name, "action" => options[:action], "id" => options[:id] ) ) |