From c2fb8ca393569105cb25bd79d1bf018c20cce51a Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 18 Mar 2006 16:11:21 +0000 Subject: 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 --- actionpack/lib/action_controller/components.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionpack/lib/action_controller') 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] ) ) -- cgit v1.2.3