Ticket #9520: datefilter_t9520_r10177.diff

django/template/defaultfilters.py

@@ -673 +673 @@
         return u''
     if arg is None:
         arg = settings.DATE_FORMAT
-    return format(value, arg)
+    try:
+        return format(value, arg)
+    except AttributeError:
+        return value
 date.is_safe = False
 
 def time(value, arg=None):
@@ -683 +686 @@
         return u''
     if arg is None:
         arg = settings.TIME_FORMAT
-    return time_format(value, arg)
+    try:
+        return time_format(value, arg)
+    except AttributeError:
+        return value
 time.is_safe = False
 
 def timesince(value, arg=None):