summaryrefslogtreecommitdiff
path: root/django/db
diff options
context:
space:
mode:
authorClifford Gama <cliffygamy@gmail.com>2025-10-09 21:24:06 +0200
committerNatalia <124304+nessita@users.noreply.github.com>2025-10-15 18:25:43 -0300
commit5c114ce2d8479549ee9dd486bc28df5b2e3d54ad (patch)
tree056675b712a562ada94e86002799d61faa8d0ee2 /django/db
parent094797ae501167b3ee00fa5f53c9c232b2206329 (diff)
[6.0.x] Fixed 36622 -- Prevented LazyObject FileField storages from evaluating at boot time.
Co-authored-by: Fabien MICHEL <fmichel@adista.fr> Backport of 6862d46dd96d71d80d6d2fa9873a93d811b39562 from main.
Diffstat (limited to 'django/db')
-rw-r--r--django/db/models/fields/files.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/models/fields/files.py b/django/db/models/fields/files.py
index 5216ff565f..dbf227ae92 100644
--- a/django/db/models/fields/files.py
+++ b/django/db/models/fields/files.py
@@ -248,7 +248,7 @@ class FileField(Field):
):
self._primary_key_set_explicitly = "primary_key" in kwargs
- self.storage = storage or default_storage
+ self.storage = storage if storage is not None else default_storage
if callable(self.storage):
# Hold a reference to the callable for deconstruct().
self._storage_callable = self.storage