From bff39bfb8cbc43bbeb78897c76583ab942927a0a Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Sun, 11 Jun 2006 00:33:44 +0000 Subject: [PATCH] Fixed #2127 -- Made datetime filters fail silently when passed empty strings or None. Thanks, Gary Wilson. git-svn-id: http://code.djangoproject.com/svn/django/trunk@3117 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/template/defaultfilters.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/django/template/defaultfilters.py b/django/template/defaultfilters.py index 03069121eea..453c34b0bd5 100644 --- a/django/template/defaultfilters.py +++ b/django/template/defaultfilters.py @@ -330,6 +330,8 @@ def get_digit(value, arg): def date(value, arg=None): "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 return format(value, arg) @@ -337,6 +339,8 @@ def date(value, arg=None): def time(value, arg=None): "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 return time_format(value, arg) @@ -344,6 +348,8 @@ def time(value, arg=None): def timesince(value): '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) ###################