Merge branch 'master' into cherry

1 files changed, 3 insertions, 1 deletions

diff --git a/actionpack/lib/action_controller/base/render.rb b/actionpack/lib/action_controller/base/render.rb
index 604dd31930..606df58518 100644
--- a/actionpack/lib/action_controller/base/render.rb
+++ b/actionpack/lib/action_controller/base/render.rb
@@ -1,3 +1,5 @@
+require 'action_controller/abstract/renderer'
+
 module ActionController
   DEFAULT_RENDER_STATUS_CODE = "200 OK"
   
@@ -318,7 +320,7 @@ module ActionController
     end
 
     def render_to_string(options = {})
-      Rack::Utils.body_to_s(render_to_body(options)).to_ary.join
+      AbstractController::Renderer.body_to_s(render_to_body(options))
     end
 
     # Clears the rendered results, allowing for another render to be performed.