diff MoinMoin/macro/__init__.py @ 828:902c34d95085

quoting for attachment filenames, wikiutil.load_wikimap, split_wiki can parse quoting, join_wiki does url_quote
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Sun, 11 Jun 2006 17:48:25 +0200
parents d48400378d4c
children 5469c8b911a4
line wrap: on
line diff
--- a/MoinMoin/macro/__init__.py	Sun Jun 11 02:19:09 2006 +0200
+++ b/MoinMoin/macro/__init__.py	Sun Jun 11 17:48:25 2006 +0200
@@ -335,13 +335,10 @@
         
     def _macro_InterWiki(self, args):
         from StringIO import StringIO
-
-        # load interwiki list
-        dummy = wikiutil.resolve_wiki(self.request, '')
-
+        interwiki_list = wikiutil.load_wikimap(self.request)
         buf = StringIO()
         buf.write('<dl>')
-        list = self.cfg._interwiki_list.items() # this is where we cached it
+        list = interwiki_list.items() # this is where we cached it
         list.sort()
         for tag, url in list:
             buf.write('<dt><tt><a href="%s">%s</a></tt></dt>' % (
@@ -351,7 +348,6 @@
             else:
                 buf.write('<dd><tt>%s</tt></dd>' % url)
         buf.write('</dl>')
-
         return self.formatter.rawHTML(buf.getvalue())
 
     def _macro_PageCount(self, args):