aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/abstract
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-04-17 18:34:49 -0500
committerJeremy Kemper <jeremy@bitsweat.net>2009-04-17 18:34:49 -0500
commitdf42d26f990cd013c8d80505a9a92537fbcaa4bf (patch)
treec84690847806110293b082a23449cfb6deda1eec /actionpack/lib/action_controller/abstract
parentecdc0643f21fa6e4fc75aecc8b3be547f60c3bbc (diff)
downloadrails-df42d26f990cd013c8d80505a9a92537fbcaa4bf.tar.gz
rails-df42d26f990cd013c8d80505a9a92537fbcaa4bf.tar.bz2
rails-df42d26f990cd013c8d80505a9a92537fbcaa4bf.zip
Rename render_to_string to render_to_body since it may return any Rack-compatible body, not just strings
Diffstat (limited to 'actionpack/lib/action_controller/abstract')
-rw-r--r--actionpack/lib/action_controller/abstract/renderer.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/abstract/renderer.rb b/actionpack/lib/action_controller/abstract/renderer.rb
index 68c3b07b84..eb248652a8 100644
--- a/actionpack/lib/action_controller/abstract/renderer.rb
+++ b/actionpack/lib/action_controller/abstract/renderer.rb
@@ -17,7 +17,7 @@ module AbstractController
end
def render(options = {})
- self.response_body = render_to_string(options)
+ self.response_body = render_to_body(options)
end
# Raw rendering of a template.
@@ -26,7 +26,7 @@ module AbstractController
# @option _layout<String> The relative path to the layout template to use
#
# :api: plugin
- def render_to_string(options = {})
+ def render_to_body(options = {})
name = options[:_template_name] || action_name
template = options[:_template] || view_paths.find_by_parts(name.to_s, formats, options[:_prefix])
@@ -55,4 +55,4 @@ module AbstractController
end
end
end
-end \ No newline at end of file
+end