提交: ea1b7596d492faea4a21f7210ea6dbdd4c8eb8cb - pukiwiki-fork (git)

Commit MetaInfo

• 修訂: ea1b7596d492faea4a21f7210ea6dbdd4c8eb8cb (tree)
• 時間: 2018-12-19 06:13:56
• 作者: umorigu <umorigu@gmai...>
• Commiter: umorigu

Log Message

BugTrack/2478 Handle plus(+) char in URL as space for page name

* page name encode - name:'A B' => url:'A+B'
* page name decode - url:'A+B' => name:'A B'

Change Summary

• modified: lib/func.php
• modified: lib/init.php

差異

--- a/lib/func.php
+++ b/lib/func.php
@@ -462,7 +462,7 @@ function arg_check($str)
 
 function _pagename_urlencode_callback($matches)
 {
-	return rawurlencode($matches[0]);
+	return urlencode($matches[0]);
 }
 
 function pagename_urlencode($page)

--- a/lib/init.php
+++ b/lib/init.php
@@ -402,7 +402,7 @@ if (! isset($vars['cmd']) && ! isset($vars['plugin'])) {
 	$arg = preg_replace("#^([^&]*)&.*$#", "$1", $arg);
 	if ($arg == '') $arg = $defaultpage;
 	if (strpos($arg, '=') !== false) $arg = $defaultpage; // Found '/?key=value'
-	$arg = rawurldecode($arg);
+	$arg = urldecode($arg);
 	$arg = strip_bracket($arg);
 	$arg = input_filter($arg);
 	$get['page'] = $post['page'] = $vars['page'] = $arg;