Ticket #16676: 16676.patch

django/template/defaultfilters.py

@@ -664 +664 @@
     except (ValueError, TypeError):
         try:
             return value + arg
-        except:
-            return value
+        except Exception:
+            return ''
 add.is_safe = False
 
 def get_digit(value, arg):

tests/regressiontests/templates/filters.py

@@ -346 +346 @@
         #Ticket 9520: Make sure |date doesn't blow up on non-dates
         'date03': (r'{{ d|date:"m" }}', {'d': 'fail_string'}, ''),
 
-         # Tests for #11687
+         # Tests for #11687 and #16676
          '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'),
+         'add02': (r'{{ i|add:"napis" }}', {'i': 2000}, ''),
+         'add03': (r'{{ i|add:16 }}', {'i': 'not_an_int'}, ''),
          'add04': (r'{{ i|add:"16" }}', {'i': 'not_an_int'}, 'not_an_int16'),
          'add05': (r'{{ l1|add:l2 }}', {'l1': [1, 2], 'l2': [3, 4]}, '[1, 2, 3, 4]'),
          'add06': (r'{{ t1|add:t2 }}', {'t1': (3, 4), 't2': (1, 2)}, '(3, 4, 1, 2)'),