From 5d7af7b1a9a62cf2d98f8dd8bb6f8ce49b886316 Mon Sep 17 00:00:00 2001
From: Adrian Holovaty <adrian@holovaty.com>
Date: Wed, 28 Jun 2006 01:08:04 +0000
Subject: [PATCH] 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
---
django/contrib/markup/templatetags/markup.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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: