Author: jacob Date: 2009-04-02 00:22:17 -0500 (Thu, 02 Apr 2009) New Revision: 10366
Modified: django/branches/releases/1.0.X/django/template/defaultfilters.py django/branches/releases/1.0.X/tests/regressiontests/templates/filters.py Log: [1.0.X] Fixed #9520: make the date filter fail silently for non-date values. Thanks, Andrew Badr and Eric Holscher. Backport of r10365 from trunk. Modified: django/branches/releases/1.0.X/django/template/defaultfilters.py =================================================================== --- django/branches/releases/1.0.X/django/template/defaultfilters.py 2009-04-02 05:20:25 UTC (rev 10365) +++ django/branches/releases/1.0.X/django/template/defaultfilters.py 2009-04-02 05:22:17 UTC (rev 10366) @@ -673,7 +673,10 @@ return u'' if arg is None: arg = settings.DATE_FORMAT - return format(value, arg) + try: + return format(value, arg) + except AttributeError: + return '' date.is_safe = False def time(value, arg=None): @@ -683,7 +686,10 @@ return u'' if arg is None: arg = settings.TIME_FORMAT - return time_format(value, arg) + try: + return time_format(value, arg) + except AttributeError: + return '' time.is_safe = False def timesince(value, arg=None): Modified: django/branches/releases/1.0.X/tests/regressiontests/templates/filters.py =================================================================== --- django/branches/releases/1.0.X/tests/regressiontests/templates/filters.py 2009-04-02 05:20:25 UTC (rev 10365) +++ django/branches/releases/1.0.X/tests/regressiontests/templates/filters.py 2009-04-02 05:22:17 UTC (rev 10366) @@ -317,4 +317,10 @@ 'join02': (r'{% autoescape off %}{{ a|join:", " }}{% endautoescape %}', {'a': ['alpha', 'beta & me']}, 'alpha, beta & me'), 'join03': (r'{{ a|join:" & " }}', {'a': ['alpha', 'beta & me']}, 'alpha & beta & me'), 'join04': (r'{% autoescape off %}{{ a|join:" & " }}{% endautoescape %}', {'a': ['alpha', 'beta & me']}, 'alpha & beta & me'), + + + 'date01': (r'{{ d|date:"m" }}', {'d': datetime(2008, 1, 1)}, '01'), + 'date02': (r'{{ d|date }}', {'d': datetime(2008, 1, 1)}, 'Jan. 1, 2008'), + #Ticket 9520: Make sure |date doesn't blow up on non-dates + 'date03': (r'{{ d|date:"m" }}', {'d': 'fail_string'}, ''), } --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Django updates" group. To post to this group, send email to django-updates@googlegroups.com To unsubscribe from this group, send email to django-updates+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/django-updates?hl=en -~----------~----~----~----~------~----~------~--~---