diff options
| author | Nicholas Seckar <nseckar@gmail.com> | 2006-03-22 19:41:39 +0000 |
|---|---|---|
| committer | Nicholas Seckar <nseckar@gmail.com> | 2006-03-22 19:41:39 +0000 |
| commit | c05c22a45f9332f50eb6efae5a393268f6b6609d (patch) | |
| tree | aded989d9cb75e5a8a5bec5bc4763e860de7240c /actionpack/lib/action_view/helpers/prototype_helper.rb | |
| parent | 2d24bed3a072aac1a0087ec4c4681889e49ea6a4 (diff) | |
| download | rails-c05c22a45f9332f50eb6efae5a393268f6b6609d.tar.gz rails-c05c22a45f9332f50eb6efae5a393268f6b6609d.tar.bz2 rails-c05c22a45f9332f50eb6efae5a393268f6b6609d.zip | |
Fix double url escaping of remote_function. Add :escape => false option to ActionView's url_for.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4014 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_view/helpers/prototype_helper.rb')
| -rw-r--r-- | actionpack/lib/action_view/helpers/prototype_helper.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/prototype_helper.rb b/actionpack/lib/action_view/helpers/prototype_helper.rb index de964edae8..40bb18c624 100644 --- a/actionpack/lib/action_view/helpers/prototype_helper.rb +++ b/actionpack/lib/action_view/helpers/prototype_helper.rb @@ -301,7 +301,9 @@ module ActionView "new Ajax.Request(" : "new Ajax.Updater(#{update}, " - function << "'#{url_for(options[:url])}'" + url_options = options[:url] + url_options = url_options.merge(:escape => false) if url_options.is_a? Hash + function << "'#{url_for(url_options)}'" function << ", #{javascript_options})" function = "#{options[:before]}; #{function}" if options[:before] |