From 24c539b1cc5e02ebcddf5840815a8daccecafa38 Mon Sep 17 00:00:00 2001 From: tobes Date: Wed, 3 Oct 2012 14:19:09 +0100 Subject: [PATCH] [#2939] Fix bug in jinja2 truncate on None --- ckan/lib/jinja_extensions.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ckan/lib/jinja_extensions.py b/ckan/lib/jinja_extensions.py index 304d686e527..1f19e0a76fc 100644 --- a/ckan/lib/jinja_extensions.py +++ b/ckan/lib/jinja_extensions.py @@ -29,6 +29,8 @@ def truncate(value, length=255, killwords=None, end='...'): ''' A more clever truncate. If killwords is supplied we use the default truncate. Otherwise we try to truncate using killwords=False, if this truncates the whole value we try again with killwords=True ''' + if value is None: + return None if killwords is not None: return do_truncate(value, length=length, killwords=killwords, end=end) result = do_truncate(value, length=length, killwords=False, end=end)