From: umorigu <umorigu@gmail.com>
Date: Fri, 12 Feb 2016 17:54:38 +0000 (+0900)
Subject: BugTrack2/361 Apply simple URL for InterWiki link of PukiWiki site
X-Git-Tag: r1_5_1~15
X-Git-Url: http://git.osdn.net/view?p=pukiwiki%2Fpukiwiki.git;a=commitdiff_plain;h=38f591c26d4d7f06fe7cf5a57fc18ad609c9bfc1

BugTrack2/361 Apply simple URL for InterWiki link of PukiWiki site
---

diff --git a/lib/make_link.php b/lib/make_link.php
index 9d48d42..a83b45f 100644
--- a/lib/make_link.php
+++ b/lib/make_link.php
@@ -837,7 +837,12 @@ function get_interwiki_url($name, $param)
 		if (isset($encode_aliases[$opt])) $opt = & $encode_aliases[$opt];
 
 		// Encoding conversion into specified encode, and URLencode
-		$param = rawurlencode(mb_convert_encoding($param, $opt, SOURCE_ENCODING));
+		if (strpos($url, '$1') === FALSE && substr($url, -1) === '?') {
+			// PukiWiki site
+			$param = pagename_urlencode(mb_convert_encoding($param, $opt, SOURCE_ENCODING));
+		} else {
+			$param = rawurlencode(mb_convert_encoding($param, $opt, SOURCE_ENCODING));
+		}
 	}
 
 	// Replace or Add the parameter