diff options
| -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 |