aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/abstract_controller/renderer.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2009-08-07 17:13:44 +0200
committerJosé Valim <jose.valim@gmail.com>2009-08-07 17:13:44 +0200
commite45e120af99f0d598e9fcdc24ec06cdd3615ba06 (patch)
tree0f3618e1cb067addc9084b173d89994839b2a2ef /actionpack/lib/abstract_controller/renderer.rb
parentdac8927b0576bff89ba3a4fcbf502dffc9b39e89 (diff)
parentbfe58ac05d4b7ba5d5c04c3aa9a719e340b2111e (diff)
downloadrails-e45e120af99f0d598e9fcdc24ec06cdd3615ba06.tar.gz
rails-e45e120af99f0d598e9fcdc24ec06cdd3615ba06.tar.bz2
rails-e45e120af99f0d598e9fcdc24ec06cdd3615ba06.zip
Merge branch 'master' of git://github.com/rails/rails into old
Diffstat (limited to 'actionpack/lib/abstract_controller/renderer.rb')
-rw-r--r--actionpack/lib/abstract_controller/renderer.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/abstract_controller/renderer.rb b/actionpack/lib/abstract_controller/renderer.rb
index 73e6b2a4dc..da57d0ff4d 100644
--- a/actionpack/lib/abstract_controller/renderer.rb
+++ b/actionpack/lib/abstract_controller/renderer.rb
@@ -54,7 +54,7 @@ module AbstractController
# :api: plugin
def render_to_body(options = {})
# TODO: Refactor so we can just use the normal template logic for this
- if options.key?(:_partial_object)
+ if options.key?(:partial)
view_context.render_partial(options)
else
_determine_template(options)