diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2006-09-29 08:26:45 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2006-09-29 08:26:45 +0000 |
| commit | d15d15b2c236a556f89536961adf2de7f1fd04dc (patch) | |
| tree | 37f35f4cec5c7bdf34cbf6fbcd2a5ef44cf8a97c /actionpack/lib/action_controller/components.rb | |
| parent | d7b5b44a0e6fddb772c1c0779489c17e1caa4a39 (diff) | |
| download | rails-d15d15b2c236a556f89536961adf2de7f1fd04dc.tar.gz rails-d15d15b2c236a556f89536961adf2de7f1fd04dc.tar.bz2 rails-d15d15b2c236a556f89536961adf2de7f1fd04dc.zip | |
Deprecate @response
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5207 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/components.rb')
| -rw-r--r-- | actionpack/lib/action_controller/components.rb | 6 |
1 files changed, 3 insertions, 3 deletions
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] |