aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorNicholas Seckar <nseckar@gmail.com>2005-10-25 02:15:08 +0000
committerNicholas Seckar <nseckar@gmail.com>2005-10-25 02:15:08 +0000
commit86a571090c43cd00284e563b63a79016acc2f18b (patch)
tree60aaab23ade94c51ae76551691476075986bf963 /actionpack/lib
parent3a2943c54de7e288ac2443556257df7b2d69ac68 (diff)
downloadrails-86a571090c43cd00284e563b63a79016acc2f18b.tar.gz
rails-86a571090c43cd00284e563b63a79016acc2f18b.tar.bz2
rails-86a571090c43cd00284e563b63a79016acc2f18b.zip
Reset template variables after using render_to_string. Closes #2559
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2723 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib')
-rwxr-xr-xactionpack/lib/action_controller/base.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 067dcacca6..b338904142 100755
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -623,6 +623,8 @@ module ActionController #:nodoc:
def render_to_string(options = nil) #:doc:
result = render(options)
erase_render_results
+ @variables_added = nil
+ @template.instance_variable_set("@assigns_added", nil)
result
end