diff options
| author | Erik St. Martin <alakriti@gmail.com> | 2010-01-23 16:10:44 -0500 |
|---|---|---|
| committer | Stefan Penner <stefan.penner@gmail.com> | 2010-01-27 12:44:32 -0600 |
| commit | 7bf5aef907a90a9896c05ae3c6ed371a70aa6b8f (patch) | |
| tree | 2a8399b87992e5ca860ff0de8317365e006542e7 /actionpack/lib | |
| parent | 255066b6c7a5877de20e9aef9b58f886c7e66e13 (diff) | |
| download | rails-7bf5aef907a90a9896c05ae3c6ed371a70aa6b8f.tar.gz rails-7bf5aef907a90a9896c05ae3c6ed371a70aa6b8f.tar.bz2 rails-7bf5aef907a90a9896c05ae3c6ed371a70aa6b8f.zip | |
fixed current tests that were failing do to module location change, this is temporary to fix state of repo till all the new tests are complete
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_view/helpers/ajax_helper.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_view/helpers/ajax_helper.rb b/actionpack/lib/action_view/helpers/ajax_helper.rb index 54915e3c89..6f7f3750bc 100644 --- a/actionpack/lib/action_view/helpers/ajax_helper.rb +++ b/actionpack/lib/action_view/helpers/ajax_helper.rb @@ -574,6 +574,8 @@ module ActionView if !options && url.is_a?(Hash) && url.key?(:url) url, options = url.delete(:url), url end + options = {} if options.nil? + set_callbacks(options, options[:html] ||= {}) super |