提交: 9f9868f11316f860bf3a83e0faa50023ddbbb1d7 - pukiwiki-fork (git)

Commit MetaInfo

• 修訂: 9f9868f11316f860bf3a83e0faa50023ddbbb1d7 (tree)
• 時間: 2021-11-28 22:34:30
• 作者: umorigu <umorigu@gmai...>
• Commiter: umorigu

Log Message

BugTrack/2525 Convert QueryString by PageURIHandler

Change Summary

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

差異

--- a/lib/func.php
+++ b/lib/func.php
@@ -1178,6 +1178,10 @@ function get_preg_u() {
 }
 
 class PukiWikiStandardPageURIHandler {
+	function filter_raw_query_string($query_string) {
+		return $query_string;
+	}
+
 	function get_page_uri_fragment($page) {
 		return '?' . pagename_urlencode($page);
 	}

--- a/lib/init.php
+++ b/lib/init.php
@@ -295,6 +295,21 @@ if (PKWK_QUERY_STRING_MAX && strlen($arg) > PKWK_QUERY_STRING_MAX) {
 }
 $arg = input_filter($arg); // \0 除去
 
+// Convert QueryString by PageURIHandler
+$arg_replaced = $pkwk_page_uri_handler->filter_raw_query_string($arg);
+if ($arg_replaced !== $arg) {
+	$_GET = array();
+	$m = array();
+	foreach (explode('&', $arg_replaced) as $kv) {
+		if (preg_match('/^([^=]+)(=(.+))?/', $kv, $matches)) {
+			$_GET[$m[1]] = is_null($m[3]) ? '' : $m[3];
+		}
+	}
+	unset($m);
+	$arg = $arg_replaced;
+}
+unset($arg_replaced);
+
 // unset QUERY_STRINGs
 foreach (array('QUERY_STRING', 'argv', 'argc') as $key) {
 	unset(${$key}, $_SERVER[$key], $HTTP_SERVER_VARS[$key]);