mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-07 23:22:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

修正路由额外参数获取

Browse Source
This commit is contained in:
thinkphp
2015-12-31 14:37:08 +08:00
parent bf40bcf80e
commit ab467b3b7e
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
library/think/route.php
View File

@@ -600,7 +600,11 @@ class Route
} }
// 解析路由自动传人参数 // 解析路由自动传人参数
if (is_array($route) && isset($route[1])) { if (is_array($route) && isset($route[1])) {
if (is_string($route[1])) {
parse_str($route[1], $params); parse_str($route[1], $params);
} else {
$params = $route[1];
}
$var = array_merge($var, $params); $var = array_merge($var, $params);
} }
$_GET = array_merge($var, $_GET); $_GET = array_merge($var, $_GET);
@@ -638,7 +642,11 @@ class Route
} }
// 解析路由自动传人参数 // 解析路由自动传人参数
if (is_array($route) && isset($route[1])) { if (is_array($route) && isset($route[1])) {
if (is_string($route[1])) {
parse_str($route[1], $params); parse_str($route[1], $params);
} else {
$params = $route[1];
}
$var = array_merge($var, $params); $var = array_merge($var, $params);
} }
$_GET = array_merge($var, $_GET); $_GET = array_merge($var, $_GET);