summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary Wilson Jr <gary.wilson@gmail.com>2007-09-14 02:54:12 +0000
committerGary Wilson Jr <gary.wilson@gmail.com>2007-09-14 02:54:12 +0000
commitda0fef756c0e47e549cba1edc1f3900973e2b70a (patch)
tree4d918b20b5e4983ced673f0c77400605b2207872
parent09145d2e5f1445d59d0c121394b78ec5ed196056 (diff)
Fixed #5123 -- Fixed ImageField to pass along keyword arguments in its formfield method.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6154 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/db/models/fields/__init__.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py
index 74b08884da..795f8936bd 100644
--- a/django/db/models/fields/__init__.py
+++ b/django/db/models/fields/__init__.py
@@ -848,6 +848,7 @@ class ImageField(FileField):
def formfield(self, **kwargs):
defaults = {'form_class': forms.ImageField}
+ defaults.update(kwargs)
return super(ImageField, self).formfield(**defaults)
class IntegerField(Field):