changeset 2630:d1658035d233

Merge main.
author Karol 'grzywacz' Nowak <grzywacz@sul.uni.lodz.pl>
date Tue, 24 Jul 2007 01:13:18 +0200
parents 5dac44252ca6 (current diff) eb3297891475 (diff)
children 80ec0bb44cb2
files
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/macro/Action.py	Tue Jul 24 01:12:56 2007 +0200
+++ b/MoinMoin/macro/Action.py	Tue Jul 24 01:13:18 2007 +0200
@@ -75,12 +75,11 @@
         text = self.args.get('text', action)
         text = _(text, formatted=False)
         text = wikiutil.escape(text, 1)
+        action, args = (action.split('&') + [None] * 2)[:2]
         if action in self.getValidActions():
-            # Escape user input
-            action = wikiutil.escape(action, 1)
             # Create link
             page = self.macro.formatter.page
-            link = page.link_to(self.request, text, querystr='action=%s' % action)
+            link = page.link_to(self.request, text, querystr='action=%s&%s' % (action, args))
             return link
         else:
             return text