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

改进Url类路由地址生成的匹配检测

Browse Source
This commit is contained in:
thinkphp
2016-06-27 16:42:07 +08:00
parent 5bf12f6c18
commit b018a93955
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
library/think/Url.php
View File

@@ -241,13 +241,10 @@ class Url
} }
$match = true; $match = true;
} }
if (empty($pattern)) { if (!empty($param) && array_intersect_assoc($param, $array) != $param) {
// 没有任何变量 $match = false;
if ($param) { }
$vars = array_diff_key($array, $param); if ($match) {
}
return $url;
} elseif ($match && (empty($param) || array_intersect_assoc($param, $array) == $param)) {
// 存在变量定义 // 存在变量定义
$vars = array_diff_key($array, $param); $vars = array_diff_key($array, $param);
return $url; return $url;