Ticket #3184: defaultfilters.diff

django/template/defaultfilters.py

@@ -289 +289 @@
     """
     def _helper(value, tabs):
         indent = '\t' * tabs
-        if value[1]:
-            return '%s<li>%s\n%s<ul>\n%s\n%s</ul>\n%s</li>' % (indent, value[0], indent,
-                '\n'.join([_helper(v, tabs+1) for v in value[1]]), indent, indent)
+        if type(value) is type([]):
+            if value[1]:
+                if type(value[1]) is type([]):
+                    return '%s<li>%s\n%s<ul>\n%s\n%s</ul>\n%s</li>' % (indent, value[0], indent,
+                        '\n'.join([_helper(v, tabs+1) for v in value[1]]), indent, indent)
+                else:
+                    return '\n'.join([_helper(v, tabs) for v in value])
+            else:
+                return('%s<li>%s</li>' % (indent, value[0]))
         else:
-            return '%s<li>%s</li>' % (indent, value[0])
+            return('%s<li>%s</li>' % (indent, value))
+
     return _helper(value, 1)
 
 ###################