diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2007-04-21 14:15:59 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2007-04-21 14:15:59 +0000 |
| commit | 15741451855c80f775c0237cc9bcacf55666e136 (patch) | |
| tree | 2101b9c8d094853f953b3e0dbd69822b81b03124 /actionpack | |
| parent | 178880ef7c4953470453c258abccf99b98c92bb9 (diff) | |
| download | rails-15741451855c80f775c0237cc9bcacf55666e136.tar.gz rails-15741451855c80f775c0237cc9bcacf55666e136.tar.bz2 rails-15741451855c80f775c0237cc9bcacf55666e136.zip | |
Ensure that render_text only adds string content to the body of the response [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6547 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rwxr-xr-x | actionpack/lib/action_controller/base.rb | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index c7c28fe1bf..3cc848ebf5 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Ensure that render_text only adds string content to the body of the response [DHH] + * Return the string representation from an Xml Builder when rendering a partial. Closes #5044 [tpope] * Fixed that parameters from XML should also be presented in a hash with indifferent access [DHH] diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 8e01af406c..1892bc7231 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -867,9 +867,9 @@ module ActionController #:nodoc: if append_response response.body ||= '' - response.body << text + response.body << text.to_s else - response.body = text + response.body = text.to_s end end |