aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/render/rendering.rb
diff options
context:
space:
mode:
authorYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-05-12 16:21:34 -0700
committerYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-05-12 16:21:34 -0700
commit216309c16519d94a9e0aebf758029a78696ab8d6 (patch)
treedb271a9f9cb8ddf9aed72e125fe867d0e10d40e0 /actionpack/lib/action_view/render/rendering.rb
parent72ca7c591c9eace150c0ebab1633d691a1ef12cf (diff)
downloadrails-216309c16519d94a9e0aebf758029a78696ab8d6.tar.gz
rails-216309c16519d94a9e0aebf758029a78696ab8d6.tar.bz2
rails-216309c16519d94a9e0aebf758029a78696ab8d6.zip
Implemented redirects and partial rendering in new base.
Diffstat (limited to 'actionpack/lib/action_view/render/rendering.rb')
-rw-r--r--actionpack/lib/action_view/render/rendering.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/actionpack/lib/action_view/render/rendering.rb b/actionpack/lib/action_view/render/rendering.rb
index 6e368f27eb..fe785e7b20 100644
--- a/actionpack/lib/action_view/render/rendering.rb
+++ b/actionpack/lib/action_view/render/rendering.rb
@@ -95,6 +95,11 @@ module ActionView
layout ? _render_content_with_layout(text, layout, options[:locals]) : text
end
+ def _render_template_from_controller(*args)
+ @assigns_added = nil
+ _render_template_with_layout(*args)
+ end
+
def _render_template_with_layout(template, layout = nil, options = {}, partial = false)
if controller && logger
logger.info("Rendering #{template.identifier}" +