From 733e91b5281ba6c1b6136e0ee3a380c89e1a8ffd Mon Sep 17 00:00:00 2001
From: dairiki <dairiki@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Sat, 3 Mar 2001 19:29:48 +0000
Subject: [PATCH] Added new intermap entries from
 http://usemod.com/intermap.txt.

Also fixed bug: only urlencode "page" name when it's really a
query arg.  (If it's in PATH_INFO, it shouldn't be urlencoded.)


git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@462 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/interwiki.map |  6 ++++++
 lib/interwiki.php | 10 ++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/lib/interwiki.map b/lib/interwiki.map
index 9f5244152..efa06dddd 100644
--- a/lib/interwiki.map
+++ b/lib/interwiki.map
@@ -34,4 +34,10 @@ CreationMatters http://www.ourpla.net/cgi-bin/wiki.pl?
 CmWiki http://www.ourpla.net/cgi-bin/wiki.pl?
 BenefitsWiki http://www.benefitslink.com/cgi-bin/wiki.cgi?
 Why http://clublet.com/c/c/why?
+SourceForge http://sourceforge.net/
+MetaWiki http://sunir.org/apps/meta.pl?
+AcadWiki http://xarch.tu-graz.ac.at/autocad/wiki/
+CLiki http://www.telent.net/cliki/
 SenseisLibrary http://senseis.xmp.net/?
+JargonFile http://sunir.org/apps/meta.pl?wiki=JargonFile&redirect=
+WikiPedia http://www.wikipedia.com/wiki.cgi?
diff --git a/lib/interwiki.php b/lib/interwiki.php
index 4135ba489..29fe0a51e 100644
--- a/lib/interwiki.php
+++ b/lib/interwiki.php
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id: interwiki.php,v 1.4 2001-02-14 22:02:05 dairiki Exp $');
+<?php rcs_id('$Id: interwiki.php,v 1.5 2001-03-03 19:29:48 dairiki Exp $');
 
 function generate_interwikimap_and_regexp()
 {
@@ -26,7 +26,13 @@ function LinkInterWikiLink($link, $linktext='')
 
    list( $wiki, $page ) = split( ":", $link, 2 );
 
-   $url = $interwikimap[$wiki] . rawurlencode($page);
+   $url = $interwikimap[$wiki];
+
+   // Urlencode page only if it's a query arg.
+   if (strstr($url, '?'))
+      $url .= rawurlencode($page);
+   else
+      $url .= $page;
 
    if ($linktext)
       $linktext = htmlspecialchars($linktext);
-- 
2.45.0