Merge pull request #246 from dekkers/ticket_18709

Fixed #18709 -- Check if initial_value is a callable

1 files changed, 2 insertions, 0 deletions

diff --git a/django/forms/forms.py b/django/forms/forms.py
index b231de421a..fece2158ac 100644
--- a/django/forms/forms.py
+++ b/django/forms/forms.py
@@ -342,6 +342,8 @@ class BaseForm(object):
                 data_value = field.widget.value_from_datadict(self.data, self.files, prefixed_name)
                 if not field.show_hidden_initial:
                     initial_value = self.initial.get(name, field.initial)
+                    if callable(initial_value):
+                        initial_value = initial_value()
                 else:
                     initial_prefixed_name = self.add_initial_prefix(name)
                     hidden_widget = field.hidden_widget()