Ticket #17714: 17714_markdown_extensions_multiple_options.diff

django/contrib/markup/templatetags/markup.py

@@ -43 +43 @@
     generated by actual Markdown syntax, pass "safe" as the first
     extension in the list.
 
+    Extensions may be given configuration options in the form of key=value
+    pairs, separated by commas and enclosed in parenthesis immediately after
+    the extension name. For example:
+
+        {{ value|markdown:"ext_name(key1=val1, key2=val2),ext2,ext3,..." }}
+
     If the version of Markdown in use does not support extensions,
     they will be silently ignored.
 
@@ -57 +63 @@
         # markdown.version was first added in 1.6b. The only version of markdown
         # to fully support extensions before 1.6b was the shortlived 1.6a.
         if hasattr(markdown, 'version'):
-            extensions = [e for e in arg.split(",") if e]
+            extensions = []
+            # Ensure that splitting into extensions by commas ignores those
+            # commas contained within parenthesis, so that extensions are
+            # allowed multiple configuration options. 
+            for part in arg.split("("):
+                if ")" in part and extensions:
+                    config, part = part.split(")")
+                    extensions[-1] += "(%s)" % config
+                extensions.extend(e for e in part.split(",") if e)
+
             if len(extensions) > 0 and extensions[0] == "safe":
                 extensions = extensions[1:]
                 safe_mode = True