diff options
| author | Adrian Holovaty <adrian@holovaty.com> | 2006-06-28 01:08:04 +0000 |
|---|---|---|
| committer | Adrian Holovaty <adrian@holovaty.com> | 2006-06-28 01:08:04 +0000 |
| commit | 5d7af7b1a9a62cf2d98f8dd8bb6f8ce49b886316 (patch) | |
| tree | 0faf67272262075aa54a2062e7d63b5062c898d7 | |
| parent | 48562965b900bd8d4ba5f6fef4b635af844b5cee (diff) | |
Fixed #2246 -- Changed textile templatetag in contrib.markup to use DEFAULT_CHARSET setting
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3218 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/contrib/markup/templatetags/markup.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/contrib/markup/templatetags/markup.py b/django/contrib/markup/templatetags/markup.py index dc8a9da031..9cbf1b3807 100644 --- a/django/contrib/markup/templatetags/markup.py +++ b/django/contrib/markup/templatetags/markup.py @@ -27,7 +27,7 @@ def textile(value): raise template.TemplateSyntaxError, "Error in {% textile %} filter: The Python textile library isn't installed." return value else: - return textile.textile(value) + return textile.textile(value, encoding=settings.DEFAULT_CHARSET, output=settings.DEFAULT_CHARSET) def markdown(value): try: |