Ticket #7844: 7844.diff

db/models/base.py

@@ -505 +505 @@
         if filename is None:
             filename = raw_field.file_name
 
-        filename = field.get_filename(filename)
+        filename = field.get_filename(filename, directory)
 
         # If the filename already exists, keep adding an underscore to the name
         # of the file until the filename doesn't exist.

db/models/fields/__init__.py

@@ -862 +862 @@
     def get_directory_name(self):
         return os.path.normpath(force_unicode(datetime.datetime.now().strftime(smart_str(self.upload_to))))
 
-    def get_filename(self, filename):
+    def get_filename(self, filename, directory=None):
         from django.utils.text import get_valid_filename
-        f = os.path.join(self.get_directory_name(), get_valid_filename(os.path.basename(filename)))
+        if not directory:
+            directory = self.get_directory_name()
+        f = os.path.join(directory, get_valid_filename(os.path.basename(filename)))
         return os.path.normpath(f)
 
     def save_form_data(self, instance, data):