aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorDan Gebhardt <dan@cerebris.com>2011-07-15 18:22:31 -0400
committerDan Gebhardt <dan@cerebris.com>2011-07-15 18:22:31 -0400
commitc6d83ab741456303784305b0a457512e4682f97f (patch)
treeb92a22cfc684b6ba13717de45976c1b8a3a53b73 /actionpack
parentc2b62addfed2ccfb1958a0d5fce8517e01960179 (diff)
downloadrails-c6d83ab741456303784305b0a457512e4682f97f.tar.gz
rails-c6d83ab741456303784305b0a457512e4682f97f.tar.bz2
rails-c6d83ab741456303784305b0a457512e4682f97f.zip
fixed problem in which options[:html][:remote] would be overridden in form_for() - fixes #2094
Diffstat (limited to 'actionpack')
-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 3a30263b49..89bd1365cd 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)