aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/helpers/form_helper.rb
diff options
context:
space:
mode:
authorDavid Genord II <david@xspond.com>2010-06-18 15:40:20 -0400
committerJeremy Kemper <jeremy@bitsweat.net>2010-06-18 13:59:28 -0700
commita186431414de8a0f0db9f60254f421a3536cee12 (patch)
treed0a1c7bacd3d73f2399734810067591266726c27 /actionpack/lib/action_view/helpers/form_helper.rb
parent9d3eeb905341aaad942ceb0e47bd04cced34d031 (diff)
downloadrails-a186431414de8a0f0db9f60254f421a3536cee12.tar.gz
rails-a186431414de8a0f0db9f60254f421a3536cee12.tar.bz2
rails-a186431414de8a0f0db9f60254f421a3536cee12.zip
form_for without :html and with :remote should not error
[#4902 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Diffstat (limited to 'actionpack/lib/action_view/helpers/form_helper.rb')
-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 b3db3151d3..a49daab98b 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -302,7 +302,7 @@ module ActionView
args.unshift object
end
- options[:html][:remote] = true if options.delete(:remote)
+ (options[:html] ||= {})[:remote] = true if options.delete(:remote)
output = form_tag(options.delete(:url) || {}, options.delete(:html) || {})
output << fields_for(object_name, *(args << options), &proc)