aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2007-04-24 04:12:47 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2007-04-24 04:12:47 +0000
commit339a58a266c3514921ac6d2ff60de8aa5e30fb5c (patch)
treec28e7072dc353d861911c38f17b136782ab5fabc /actionpack
parent38d574c6a32ee245f6b5c51a6ca4832ea35fbae8 (diff)
downloadrails-339a58a266c3514921ac6d2ff60de8aa5e30fb5c.tar.gz
rails-339a58a266c3514921ac6d2ff60de8aa5e30fb5c.tar.bz2
rails-339a58a266c3514921ac6d2ff60de8aa5e30fb5c.zip
Stringify rendered text unless it's a Proc object for streaming.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6560 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
-rwxr-xr-xactionpack/lib/action_controller/base.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 1892bc7231..ea9b54dac9 100755
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -869,7 +869,7 @@ module ActionController #:nodoc:
response.body ||= ''
response.body << text.to_s
else
- response.body = text.to_s
+ response.body = text.is_a?(Proc) ? text : text.to_s
end
end