diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2008-11-15 02:51:10 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2008-11-15 02:51:10 +0000 |
| commit | 087f8aa7819c7058bd3c2456cd406978751b3087 (patch) | |
| tree | 2db62e971efc5fbd866a595c5275cf5d215a3015 | |
| parent | 781a1763d94c7e867d9ba80b3f075526510a3482 (diff) | |
[1.0.X] Fixed a bug introduced in r9443.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9447 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/template/defaultfilters.py | 1 |
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] |
