diff options
author | Yehuda Katz <wycats@gmail.com> | 2009-08-06 19:43:28 -0300 |
---|---|---|
committer | Yehuda Katz <wycats@gmail.com> | 2009-08-06 19:43:28 -0300 |
commit | f0945409d935cdd3cb783a728d68414e7ca02dfc (patch) | |
tree | a2c10d41efa13ba7fdcf1313ceedd18352b90ab1 /actionpack/lib/action_view | |
parent | 7f717abb0ed280ba1a1f8abfeeff84bf24cad3e7 (diff) | |
download | rails-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_view')
-rw-r--r-- | actionpack/lib/action_view/context.rb | 4 | ||||
-rw-r--r-- | actionpack/lib/action_view/render/partials.rb | 2 | ||||
-rw-r--r-- | actionpack/lib/action_view/render/rendering.rb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_view/context.rb b/actionpack/lib/action_view/context.rb index f212fe25eb..df078a7151 100644 --- a/actionpack/lib/action_view/context.rb +++ b/actionpack/lib/action_view/context.rb @@ -12,11 +12,11 @@ module ActionView # # Context.for_controller[controller] Create a new ActionView instance for a # controller - # Context#_render_partial_from_controller[options] + # Context#render_partial[options] # - responsible for setting options[:_template] # - Returns String with the rendered partial # options<Hash>:: see _render_partial in ActionView::Base - # Context#_render_template_from_controller[template, layout, options, partial] + # Context#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 diff --git a/actionpack/lib/action_view/render/partials.rb b/actionpack/lib/action_view/render/partials.rb index ccb14d513a..8bdff0f3b9 100644 --- a/actionpack/lib/action_view/render/partials.rb +++ b/actionpack/lib/action_view/render/partials.rb @@ -177,7 +177,7 @@ module ActionView attr_accessor :_partial end - def _render_partial_from_controller(*args) + def render_partial(*args) @assigns_added = false _render_partial(*args) end diff --git a/actionpack/lib/action_view/render/rendering.rb b/actionpack/lib/action_view/render/rendering.rb index 162e38c484..86a59dd1bc 100644 --- a/actionpack/lib/action_view/render/rendering.rb +++ b/actionpack/lib/action_view/render/rendering.rb @@ -123,7 +123,7 @@ module ActionView layout ? _render_content_with_layout(text, layout, options[:locals]) : text end - def _render_template_from_controller(*args) + def render_template(*args) @assigns_added = nil _render_template_with_layout(*args) end |