Merge branch 'issue-720'

heartcombo · Jan 2, 2013 · 5ae7ffb · 5ae7ffb
2 parents e8bb7b3 + 9843120
commit 5ae7ffb
Show file tree

Hide file tree

Showing 2 changed files with 78 additions and 68 deletions.
diff --git a/lib/simple_form/action_view_extensions/builder.rb b/lib/simple_form/action_view_extensions/builder.rb
@@ -194,7 +194,7 @@ def collection_check_boxes(attribute, collection, value_method, text_method, opt
       #   end
       def simple_fields_for(*args, &block)
         options = args.extract_options!
-        options[:wrapper]  ||= self.options[:wrapper]
+        options[:wrapper] = self.options[:wrapper] if options[:wrapper].nil?
         options[:defaults] ||= self.options[:defaults]
 
         if self.class < ActionView::Helpers::FormBuilder