Commit 5d7af7b1 authored by Adrian Holovaty's avatar Adrian Holovaty
Browse files

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
parent 48562965

django/contrib/markup/templatetags/markup.py

+1 −1
Original line number Diff line number Diff line
@@ -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: