diff --git a/VERSION b/VERSION index df34cd76..346142e8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 1.99.7 (2012-04-19 22:47:29) dev +Version 1.99.7 (2012-04-19 22:50:51) dev diff --git a/gluon/contrib/markmin/markmin2html.py b/gluon/contrib/markmin/markmin2html.py index c1f36624..b2e68214 100755 --- a/gluon/contrib/markmin/markmin2html.py +++ b/gluon/contrib/markmin/markmin2html.py @@ -366,10 +366,10 @@ def render(text,extra={},allowed={},sep='p',URL=None,environment=None): # this is experimental @{controller/index/args} # turns into a digitally signed URL def u1(match,URL=URL): - b,c = match.group('a'), match.group('b'), match.group('c') - return URL(b,args=c.split('/'),scheme=True,host=True) + f,args = match.group('f'), match.group('args') + return URL(f,args=args.split('/'),scheme=True,host=True) text = re.compile( - '@\{(?P\w+)/(?P\w+)/(?P.+?)\}' + '@\{(?P\w+)/(?P.+?)\}' ).sub(u1,text) #############################################################