From d7674637f9ac7c9764a4fe09dbc15ee239ce5a77 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Fri, 29 Sep 2006 07:34:02 +0000 Subject: Deprecation: @request will be removed after 1.2. Use the request method instead. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5201 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/components.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'actionpack/lib/action_controller/components.rb') diff --git a/actionpack/lib/action_controller/components.rb b/actionpack/lib/action_controller/components.rb index c05b1eb068..0515461910 100644 --- a/actionpack/lib/action_controller/components.rb +++ b/actionpack/lib/action_controller/components.rb @@ -139,22 +139,22 @@ module ActionController #:nodoc: self.class end end - + # Create a new request object based on the current request. # The new request inherits the session from the current request, # bypassing any session options set for the component controller's class def request_for_component(controller_name, options) - request = @request.dup - request.session = @request.session - - request.instance_variable_set( + new_request = request.dup + new_request.session = request.session + + new_request.instance_variable_set( :@parameters, (options[:params] || {}).with_indifferent_access.update( "controller" => controller_name, "action" => options[:action], "id" => options[:id] ) ) - - request + + new_request end def component_logging(options) -- cgit v1.2.3