aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/helpers
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-07-26 13:50:20 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2011-07-26 13:50:20 -0700
commitef89a70540f09e4c454e05a3c9ae0824884ad967 (patch)
treeb0d573e04ee95770e02c38b464b6805f4457ece3 /actionpack/lib/action_view/helpers
parentd482cf8bfa941b76cce2ae2b60158573615a7d16 (diff)
parent455e3212846586eb07cedae2946887583f874204 (diff)
downloadrails-ef89a70540f09e4c454e05a3c9ae0824884ad967.tar.gz
rails-ef89a70540f09e4c454e05a3c9ae0824884ad967.tar.bz2
rails-ef89a70540f09e4c454e05a3c9ae0824884ad967.zip
Merge pull request #2095 from dgeb/issue-2094
Fixes overriding of options[:html][:remote] in form_for() (Issue #2094)
Diffstat (limited to 'actionpack/lib/action_view/helpers')
-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)