summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Holovaty <adrian@holovaty.com>2008-01-02 05:26:41 +0000
committerAdrian Holovaty <adrian@holovaty.com>2008-01-02 05:26:41 +0000
commitc79babb4887404fccaf0e28b58651cfe2052f218 (patch)
treef80c6ae15f0b4eba14869b5e78c27d7973b51cb4
parentf4c7a0dcb66d21987837ba6d4b4f192b15d39816 (diff)
newforms-admin: Fixed #6005 -- Fixed double calling of Media() in newforms/widgets.py. Thanks, Petr Marhoun
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@6986 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/newforms/widgets.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/django/newforms/widgets.py b/django/newforms/widgets.py
index 9c4a3cd698..4f65ff633a 100644
--- a/django/newforms/widgets.py
+++ b/django/newforms/widgets.py
@@ -110,10 +110,9 @@ def media_property(cls):
m = Media()
for medium in extend:
m = m + base[medium]
- m = m + Media(definition)
return m + Media(definition)
else:
- return Media(definition)
+ return Media(definition)
else:
return base
return property(_media)