aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/render
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib/action_view/render')
-rw-r--r--actionpack/lib/action_view/render/partials.rb2
-rw-r--r--actionpack/lib/action_view/render/rendering.rb2
2 files changed, 2 insertions, 2 deletions
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