summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Holovaty <adrian@holovaty.com>2006-01-09 02:08:29 +0000
committerAdrian Holovaty <adrian@holovaty.com>2006-01-09 02:08:29 +0000
commit580a8eb42f3b998637fe629f8e40ddd822b6cfcf (patch)
treeac4e597ad9a4d670d883f1b6e4027eedbbdd6e76
parenta5005c29be0199ab9249812476743acfe7720968 (diff)
Fixed #1110 -- wordwrap template filter now calls str() on input. Thanks, scum
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1882 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/core/template/defaultfilters.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/core/template/defaultfilters.py b/django/core/template/defaultfilters.py
index f273fa0726..73394ead67 100644
--- a/django/core/template/defaultfilters.py
+++ b/django/core/template/defaultfilters.py
@@ -136,7 +136,7 @@ def wordwrap(value, arg):
Argument: number of words to wrap the text at.
"""
from django.utils.text import wrap
- return wrap(value, int(arg))
+ return wrap(str(value), int(arg))
def ljust(value, arg):
"""