diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-05-27 23:48:28 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-05-27 23:48:28 +0000 |
| commit | 3f336ad5cc9fc6b9ca9947719fce3b9e8ad0dbb6 (patch) | |
| tree | 800428310a9713581a2caeafa567f4f15f69219f /actionpack/lib/action_controller/base.rb | |
| parent | 77eb0a8493453773a4fda11320d889fae937ce89 (diff) | |
| download | rails-3f336ad5cc9fc6b9ca9947719fce3b9e8ad0dbb6.tar.gz rails-3f336ad5cc9fc6b9ca9947719fce3b9e8ad0dbb6.tar.bz2 rails-3f336ad5cc9fc6b9ca9947719fce3b9e8ad0dbb6.zip | |
Don't prepare response when rendering a component. Closes #8493.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6875 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/base.rb')
| -rwxr-xr-x | actionpack/lib/action_controller/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 8bff41d38d..883a671270 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -496,7 +496,7 @@ module ActionController #:nodoc: assign_default_content_type_and_charset response.request = request - response.prepare! + response.prepare! unless component_request? response ensure process_cleanup |