changeset 3417:425d072840ab

Merge main.
author Alexander Schremmer <alex AT alexanderweb DOT de>
date Sat, 22 Mar 2008 17:43:36 +0100
parents 5aec9a2ff763 (current diff) cb22f4c4a0fd (diff)
children 60e0a3979520
files
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/formatter/text_html.py	Sat Mar 22 17:43:22 2008 +0100
+++ b/MoinMoin/formatter/text_html.py	Sat Mar 22 17:43:36 2008 +0100
@@ -500,7 +500,8 @@
             if on:
                 href = wikiutil.join_wiki(wikiurl, wikitail)
                 if querystr:
-                    href += '?%s' % wikiutil.makeQueryString(querystr)
+                    separator = ('?', '&')['?' in href]
+                    href = '%s%s%s' % (href, separator, wikiutil.makeQueryString(querystr))
                 if wikitag_bad:
                     html_class = 'badinterwiki'
                 else: