comparison MoinMoin/formatter/text_html.py @ 3415:cb22f4c4a0fd

fix interwiki links using correct query arg separator for the case that there are query args in the interwiki map entry and additionally given in the link markup
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Sat, 22 Mar 2008 17:35:34 +0100
parents 8a54a5512c86
children 1d5995a6a0e2 f8e4e84525e8
comparison
equal deleted inserted replaced
3414:898a544b8f74 3415:cb22f4c4a0fd
498 return self.pagelink(on, pagename, **kw) 498 return self.pagelink(on, pagename, **kw)
499 else: # return InterWiki hyperlink 499 else: # return InterWiki hyperlink
500 if on: 500 if on:
501 href = wikiutil.join_wiki(wikiurl, wikitail) 501 href = wikiutil.join_wiki(wikiurl, wikitail)
502 if querystr: 502 if querystr:
503 href += '?%s' % wikiutil.makeQueryString(querystr) 503 separator = ('?', '&')['?' in href]
504 href = '%s%s%s' % (href, separator, wikiutil.makeQueryString(querystr))
504 if wikitag_bad: 505 if wikitag_bad:
505 html_class = 'badinterwiki' 506 html_class = 'badinterwiki'
506 else: 507 else:
507 html_class = 'interwiki' 508 html_class = 'interwiki'
508 title = kw.get('title', wikitag) 509 title = kw.get('title', wikitag)