summaryrefslogtreecommitdiff
path: root/django/forms
diff options
context:
space:
mode:
Diffstat (limited to 'django/forms')
-rw-r--r--django/forms/forms.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/django/forms/forms.py b/django/forms/forms.py
index 04d4e6634c..b2f00bbb1d 100644
--- a/django/forms/forms.py
+++ b/django/forms/forms.py
@@ -366,7 +366,10 @@ class BoundField(StrAndUnicode):
if callable(data):
data = data()
else:
- data = self.data
+ if isinstance(self.field, FileField) and self.data is None:
+ data = self.form.initial.get(self.name, self.field.initial)
+ else:
+ data = self.data
if not only_initial:
name = self.html_name
else: