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

2026-07-01 20:52:48 +08:00 · 2016-06-27 16:42:07 +08:00
parent 5bf12f6c18
commit b018a93955
1 changed files with 4 additions and 7 deletions
--- a/library/think/Url.php
+++ b/library/think/Url.php
@@ -241,13 +241,10 @@ class Url
                }
                $match = true;
            }
-            if (empty($pattern)) {
-                // 没有任何变量
-                if ($param) {
-                    $vars = array_diff_key($array, $param);
-                }
-                return $url;
-            } elseif ($match && (empty($param) || array_intersect_assoc($param, $array) == $param)) {
+            if (!empty($param) && array_intersect_assoc($param, $array) != $param) {
+                $match = false;
+            }
+            if ($match) {
                // 存在变量定义
                $vars = array_diff_key($array, $param);
                return $url;