Ticket #1012: coremeta2.diff

django/trunk/django/core/meta/__init__.py

@@ -1784 +1784 @@
                 self.fields_changed.append(f.verbose_name)
 
     # Save many-to-many objects. Example: Poll.set_sites()
+    import types
     for f in opts.many_to_many:
         if self.follow.get(f.name, None):
             if not f.rel.edit_inline:
-                if f.rel.raw_id_admin:
-                    new_vals = new_data.get(f.name, ())
-                else:
-                    new_vals = new_data.getlist(f.name)
+                new_vals = []
+                try:
+                    data = dict.__getitem__(new_data, f.name)
+                except:
+                    data = []
+                if type(data) == types.ListType and len(data) == 1 and \
+                  type(data[0]) == types.ListType:
+                    data = data[0]
+                for foo in data:
+                    if type(foo) == types.ListType:
+                        new_vals.append(foo[0])
+
+                    else:
+                        new_vals.append(foo)
                 was_changed = getattr(new_object, 'set_%s' % f.name)(new_vals)
                 if change and was_changed:
                     self.fields_changed.append(f.verbose_name)