From efcb5912e467ab14435a417412754a234e436f73 Mon Sep 17 00:00:00 2001
From: Jacob Kaplan-Moss <jacob@jacobian.org>
Date: Tue, 13 Jun 2006 21:47:40 +0000
Subject: [PATCH] Fixed #2147: file uploads within the update_object generic
 view now works.  Thanks, parlar.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@3123 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/views/generic/create_update.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/django/views/generic/create_update.py b/django/views/generic/create_update.py
index 0804cdf30b..c6d7db7af5 100644
--- a/django/views/generic/create_update.py
+++ b/django/views/generic/create_update.py
@@ -106,6 +106,8 @@ def update_object(request, model, object_id=None, slug=None,
 
     if request.POST:
         new_data = request.POST.copy()
+        if model._meta.has_field_type(FileField): 
+            new_data.update(request.FILES)
         errors = manipulator.get_validation_errors(new_data)
         manipulator.do_html2python(new_data)
         if not errors: