aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorDan Gebhardt <dan@cerebris.com>2011-07-15 18:22:31 -0400
committerXavier Noria <fxn@hashref.com>2011-08-13 16:22:18 -0700
commitf87b33daaf0f0a93825a3f022d52fcb5aa4c8320 (patch)
tree4343600ab9be09c31ca3a1ca7a93354de3ce50d5 /actionpack/lib
parentd13b5d4b2aac3bec055933f1769a7becff374742 (diff)
downloadrails-f87b33daaf0f0a93825a3f022d52fcb5aa4c8320.tar.gz
rails-f87b33daaf0f0a93825a3f022d52fcb5aa4c8320.tar.bz2
rails-f87b33daaf0f0a93825a3f022d52fcb5aa4c8320.zip
fixed problem in which options[:html][:remote] would be overridden in form_for() - fixes #2094
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_view/helpers/form_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index 974c963d44..52a640abf3 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -365,7 +365,7 @@ module ActionView
apply_form_for_options!(record, options)
end
- options[:html][:remote] = options.delete(:remote)
+ options[:html][:remote] = options.delete(:remote) if options.has_key?(:remote)
options[:html][:method] = options.delete(:method) if options.has_key?(:method)
options[:html][:authenticity_token] = options.delete(:authenticity_token)