From 15741451855c80f775c0237cc9bcacf55666e136 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Sat, 21 Apr 2007 14:15:59 +0000
Subject: [PATCH] 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
---
 actionpack/CHANGELOG                     | 2 ++
 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 @@ def render_text(text = nil, status = nil, append_response = false) #: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
 
-- 
GitLab