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
2016-04-01 19:41:41 +08:00
parent d5516d7200
commit 29a5fa9350
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
library/think/Url.php
View File

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