From d15d15b2c236a556f89536961adf2de7f1fd04dc Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Fri, 29 Sep 2006 08:26:45 +0000 Subject: Deprecate @response git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5207 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/components.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 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 0515461910..a7f5be2e6a 100644 --- a/actionpack/lib/action_controller/components.rb +++ b/actionpack/lib/action_controller/components.rb @@ -126,11 +126,11 @@ module ActionController #:nodoc: def component_response(options, reuse_response) klass = component_class(options) request = request_for_component(klass.controller_name, options) - response = reuse_response ? @response : @response.dup + new_response = reuse_response ? response : response.dup - klass.process_with_components(request, response, self) + klass.process_with_components(request, new_response, self) end - + # determine the controller class for the component request def component_class(options) if controller = options[:controller] -- cgit v1.2.3