Ticket #9418: django-9418.diff

django/forms/models.py

@@ -41 +41 @@
         raise ValueError("The %s could not be %s because the data didn't"
                          " validate." % (opts.object_name, fail_message))
     cleaned_data = form.cleaned_data
+    filefieldlist = []
     for f in opts.fields:
         if not f.editable or isinstance(f, models.AutoField) \
                 or not f.name in cleaned_data:
@@ -49 +50 @@
             continue
         if exclude and f.name in exclude:
             continue
+        if isinstance(f, models.FileField) or isinstance(f, models.ImageField):
+            filefieldlist.append(f)
+        else:
+            f.save_form_data(instance, cleaned_data[f.name])
+            
+    for f in filefieldlist:
         f.save_form_data(instance, cleaned_data[f.name])
+        
     # Wrap up the saving of m2m data as a function.
     def save_m2m():
         opts = instance._meta