Ticket #2910: markup.3.diff

contrib/markup/templatetags/markup.py

@@ -29 +29 @@
     else:
         return textile.textile(value, encoding=settings.DEFAULT_CHARSET, output=settings.DEFAULT_CHARSET)
 
-def markdown(value):
+def markdown(value, arg = ''):
     try:
         import markdown
     except ImportError:
@@ -37 +37 @@
             raise template.TemplateSyntaxError, "Error in {% markdown %} filter: The Python markdown library isn't installed."
         return value
     else:
-        return markdown.markdown(value)
+        extensions = arg.split(',')
+        if len(extensions) > 0 and extensions[0] == 'safe' :
+            extensions = extensions[1:]
+            safe_mode = True
+        else:
+            safe_mode = False
+        try:
+            return markdown.markdown(value, extensions, safe_mode = safe_mode)
+        except TypeError: 
+            #older version of Markdown - run without  extensions
+            return markdown.markdown(value)
 
 def restructuredtext(value):
     try: