Changeset 3117

Timestamp:

06/10/06 19:33:44 (2 years ago)

Author:

mtredinnick

Message:

Fixed #2127 -- Made datetime filters fail silently when passed empty strings or
None. Thanks, Gary Wilson.

Files:

• django/trunk/django/template/defaultfilters.py (modified) (3 diffs)

django/trunk/django/template/defaultfilters.py

@@ -331 +331 @@
-    "Formats a date according to the given format"
-    from django.utils.dateformat import format
+    if not value:
+        return ''
-    if arg is None:
-        arg = settings.DATE_FORMAT
@@ -338 +340 @@
-    "Formats a time according to the given format"
-    from django.utils.dateformat import time_format
+    if not value:
+        return ''
-    if arg is None:
-        arg = settings.TIME_FORMAT
@@ -345 +349 @@
-    'Formats a date as the time since that date (i.e. "4 days, 6 hours")'
-    from django.utils.timesince import timesince
+    if not value:
+        return ''
-    return timesince(value)
-