From d5516d7200890bdbe104d179574ffb9d502981e9 Mon Sep 17 00:00:00 2001 From: thinkphp Date: Fri, 1 Apr 2016 19:20:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3Url=E7=B1=BB=E7=94=9F?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- library/think/Url.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/library/think/Url.php b/library/think/Url.php index 3494df64cd..fcec98e8b4 100644 --- a/library/think/Url.php +++ b/library/think/Url.php @@ -226,10 +226,10 @@ public static function getRouteUrl($alias, &$vars = []) } $match = true; } - if (!empty($param) && array_intersect($param, $array) == $param) { - $vars = array_diff($array, $param); + if (empty($pattern) && empty($param)) { + // 没有任何变量定义 return $url; - } elseif (!empty($match)) { + } elseif (array_intersect($param, $array) == $param) { $vars = array_diff($array, $param); return $url; }