修正单元测试

2026-07-01 12:42:48 +08:00 · 2016-04-01 19:41:41 +08:00
parent d5516d7200
commit 29a5fa9350
1 changed files with 3 additions and 2 deletions
--- a/library/think/Url.php
+++ b/library/think/Url.php
@@ -227,9 +227,10 @@ class Url
                $match = true;
            }
            if (empty($pattern) && empty($param)) {
-                // 没有任何变量定义
+                // 没有任何变量
                return $url;
-            } elseif (array_intersect($param, $array) == $param) {
+            } elseif (!empty($match) || !empty($param) && array_intersect($param, $array) == $param) {
+                // 存在变量定义
                $vars = array_diff($array, $param);
                return $url;
            }