diff options
| author | Nicholas Seckar <nseckar@gmail.com> | 2006-01-30 04:49:17 +0000 |
|---|---|---|
| committer | Nicholas Seckar <nseckar@gmail.com> | 2006-01-30 04:49:17 +0000 |
| commit | d2adec438e2f70ea1228cefb5d592752cf720ac2 (patch) | |
| tree | 7b4a4b876565aa1490123e3c27980d4cc7c6747d /actionpack/lib/action_controller | |
| parent | f8bcfa6e042e7f953f1e7bd16195b2200a6dfc45 (diff) | |
| download | rails-d2adec438e2f70ea1228cefb5d592752cf720ac2.tar.gz rails-d2adec438e2f70ea1228cefb5d592752cf720ac2.tar.bz2 rails-d2adec438e2f70ea1228cefb5d592752cf720ac2.zip | |
Ensure assigns are copied to the template when using render :update. Closes #3620.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3497 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
| -rwxr-xr-x | actionpack/lib/action_controller/base.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 43f948e73d..862d2e5efd 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -642,6 +642,9 @@ module ActionController #:nodoc: end elsif options[:update] + add_variables_to_assigns + @template.send :evaluate_assigns + generator = ActionView::Helpers::PrototypeHelper::JavaScriptGenerator.new(@template, &block) render_javascript(generator.to_s) |