OSDN Git Service
(root)
/
pukiwiki
/
pukiwiki.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9f1d5b2
)
BugTrack2/361 Apply simple URL for InterWiki link of PukiWiki site
author
umorigu
<umorigu@gmail.com>
Fri, 12 Feb 2016 17:54:38 +0000
(
02:54
+0900)
committer
umorigu
<umorigu@gmail.com>
Fri, 12 Feb 2016 17:54:38 +0000
(
02:54
+0900)
lib/make_link.php
patch
|
blob
|
history
diff --git
a/lib/make_link.php
b/lib/make_link.php
index
9d48d42
..
a83b45f
100644
(file)
--- 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
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
}
// Replace or Add the parameter