aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/abstract/renderer.rb
diff options
context:
space:
mode:
authorYehuda Katz <wycats@gmail.com>2009-08-06 19:43:28 -0300
committerYehuda Katz <wycats@gmail.com>2009-08-06 19:43:28 -0300
commitf0945409d935cdd3cb783a728d68414e7ca02dfc (patch)
treea2c10d41efa13ba7fdcf1313ceedd18352b90ab1 /actionpack/lib/action_controller/abstract/renderer.rb
parent7f717abb0ed280ba1a1f8abfeeff84bf24cad3e7 (diff)
downloadrails-f0945409d935cdd3cb783a728d68414e7ca02dfc.tar.gz
rails-f0945409d935cdd3cb783a728d68414e7ca02dfc.tar.bz2
rails-f0945409d935cdd3cb783a728d68414e7ca02dfc.zip
replace _render_*_from_controller with render_* as they are intended to be public
Diffstat (limited to 'actionpack/lib/action_controller/abstract/renderer.rb')
-rw-r--r--actionpack/lib/action_controller/abstract/renderer.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/abstract/renderer.rb b/actionpack/lib/action_controller/abstract/renderer.rb
index 41b7d47458..f3e3903a3b 100644
--- a/actionpack/lib/action_controller/abstract/renderer.rb
+++ b/actionpack/lib/action_controller/abstract/renderer.rb
@@ -19,11 +19,11 @@ module AbstractController
# The view class must have the following methods:
# View.for_controller[controller] Create a new ActionView instance for a
# controller
- # View#_render_partial_from_controller[options]
+ # View#render_partial[options]
# - responsible for setting options[:_template]
# - Returns String with the rendered partial
# options<Hash>:: see _render_partial in ActionView::Base
- # View#_render_template_from_controller[template, layout, options, partial]
+ # View#render_template[template, layout, options, partial]
# - Returns String with the rendered template
# template<ActionView::Template>:: The template to render
# layout<ActionView::Template>:: The layout to render around the template
@@ -55,7 +55,7 @@ module AbstractController
def render_to_body(options = {})
# TODO: Refactor so we can just use the normal template logic for this
if options[:_partial_object]
- _action_view._render_partial_from_controller(options)
+ _action_view.render_partial(options)
else
_determine_template(options)
_render_template(options)
@@ -77,7 +77,7 @@ module AbstractController
# _layout<ActionView::Template>:: The layout to wrap the template in (optional)
# _partial<TrueClass, FalseClass>:: Whether or not the template to be rendered is a partial
def _render_template(options)
- _action_view._render_template_from_controller(options[:_template], options[:_layout], options, options[:_partial])
+ _action_view.render_template(options[:_template], options[:_layout], options, options[:_partial])
end
# The list of view paths for this controller. See ActionView::ViewPathSet for