Skip to content

D
django-wiki
Commit 94e60358 by benjaoming
Options

Merge pull request #108 from SacNaturalFoods/master 

fixed macro arg regex for args longer than 1 character
parents 7e6da88b 26c922bf
Showing with 1 additions and 1 deletions
wiki/plugins/macros/markdown_extensions.py
...@@ -10,7 +10,7 @@ from django.template import Context ...@@ -10,7 +10,7 @@ from django.template import Context
re_sq_short = r"'([^'\\]*(?:\\.[^'\\]*)*)'" re_sq_short = r"'([^'\\]*(?:\\.[^'\\]*)*)'"
MACRO_RE = re.compile(r'.*(\[(?P<macro>\w+)(?P<kwargs>\s\w+\:.+)*\]).*', re.IGNORECASE) MACRO_RE = re.compile(r'.*(\[(?P<macro>\w+)(?P<kwargs>\s\w+\:.+)*\]).*', re.IGNORECASE)
KWARG_RE = re.compile(r'\s*(?P<arg>\w+)(:(?P<value>([^\']|%s)))?' % re_sq_short, re.IGNORECASE) KWARG_RE = re.compile(r'\s*(?P<arg>\w+)(:(?P<value>([^\']+|%s)))?' % re_sq_short, re.IGNORECASE)
from wiki.plugins.macros import settings from wiki.plugins.macros import settings
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment