summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2008-11-15 02:49:15 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2008-11-15 02:49:15 +0000
commitec8150e78a71c49c8e69ee29cd72879c3a1daa49 (patch)
treeb784f234ad884b25199536a32f59f36aaf4a1737
parentf63929dbe2f27733806d7f69d223682c4a72b450 (diff)
Fixed a bug introduced in r9422.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9446 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/template/defaultfilters.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/django/template/defaultfilters.py b/django/template/defaultfilters.py
index 15434c7477..2f46dc7b57 100644
--- a/django/template/defaultfilters.py
+++ b/django/template/defaultfilters.py
@@ -485,6 +485,7 @@ def join(value, arg, autoescape=None):
"""
Joins a list with a string, like Python's ``str.join(list)``.
"""
+ value = map(force_unicode, value)
if autoescape:
from django.utils.html import conditional_escape
value = [conditional_escape(v) for v in value]