Merge pull request #69 from molong/master

URL生成的一个bug，含参数时
2026-07-01 20:52:48 +08:00 · 2016-05-14 06:56:00 +08:00
parent b925150d02 62fa7bd73c
commit 433726556f
1 changed files with 2 additions and 2 deletions
--- a/library/think/Url.php
+++ b/library/think/Url.php
@@ -247,9 +247,9 @@ class Url
            if (empty($pattern) && empty($param)) {
                // 没有任何变量
                return $url;
-            } elseif (!empty($match) || !empty($param) && array_intersect($param, $array) == $param) {
+            } elseif (!empty($match) || (!empty($param) && array_intersect_assoc($param, $array) == $param)) {
                // 存在变量定义
-                $vars = array_diff($array, $param);
+                $vars = array_diff_key($array, $param);
                return $url;
            }
        }