changeset 2720:ed2ab3b8bab6

wiki parser: fix interwiki links with blanks in pagename
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Sun, 12 Aug 2007 03:11:03 +0200
parents 61efafeafed5
children 2e5634c64e6d
files MoinMoin/parser/text_moin_wiki.py
diffstat 1 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/parser/text_moin_wiki.py	Sun Aug 12 02:34:13 2007 +0200
+++ b/MoinMoin/parser/text_moin_wiki.py	Sun Aug 12 03:11:03 2007 +0200
@@ -613,14 +613,12 @@
                 wiki_name = m.group('inter_wiki')
                 page_name = m.group('inter_page')
                 word = '%s:%s' % (wiki_name, page_name)
-                wikitag, wikiurl, wikitail, wikitag_bad = \
-                    wikiutil.resolve_wiki(self.request, word)
-                href = wikiutil.join_wiki(wikiurl, wikitail)
+                wikitag_bad = wikiutil.resolve_wiki(self.request, word)[3]
                 if not text:
                     text = page_name
-                return (self.formatter.interwikilink(1, wikitag, wikitail) +
+                return (self.formatter.interwikilink(1, wiki_name, page_name) +
                         self.formatter.text(text) +
-                        self.formatter.interwikilink(0))
+                        self.formatter.interwikilink(0, wiki_name, page_name))
 
             elif m.group('attach_scheme'):
                 scheme = m.group('attach_scheme')