Commit bd79677e authored by Jacob Kaplan-Moss's avatar Jacob Kaplan-Moss
Browse files

[1.1.X] Fixed #11687: the `add` filter is now less failsome when faced with... 

[1.1.X] Fixed #11687: the `add` filter is now less failsome when faced with things that can't be coerced to integers.

Backport of [12497] from trunk, although the fix here is slightly different to
avoid adding new behavior to a bugfix branch.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12499 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 8c4f1665

django/template/defaultfilters.py

+4 −1
Original line number Diff line number Diff line
@@ -650,7 +650,10 @@ unordered_list.needs_autoescape = True 


def add(value, arg):

    """Adds the arg to the value."""

    try:

        return int(value) + int(arg)

    except (ValueError, TypeError):

        return value

add.is_safe = False



def get_digit(value, arg):

tests/regressiontests/templates/filters.py

+6 −0
Original line number Diff line number Diff line
@@ -333,4 +333,10 @@ def get_filter_tests(): 
        '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'}, ''),



         # Ticket #11687: make sure that add works on int-able things.

         'add01': (r'{{ i|add:"5" }}', {'i': 2000}, '2005'),

         'add02': (r'{{ i|add:"napis" }}', {'i': 2000}, '2000'),

         'add03': (r'{{ i|add:16 }}', {'i': 'not_an_int'}, 'not_an_int'),

         'add04': (r'{{ i|add:"16" }}', {'i': 'not_an_int'}, 'not_an_int'),

    }