From 1aea75468db9d9704562b18917ba288a639ecb91 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Thu, 18 Aug 2016 08:23:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9BUrl=E7=B1=BB=E7=9A=84build?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Url.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/library/think/Url.php b/library/think/Url.php
index 2d2acb82..d522b90c 100644
--- a/library/think/Url.php
+++ b/library/think/Url.php
@@ -73,9 +73,10 @@ class Url
             parse_str($info['query'], $params);
             $vars = array_merge($params, $vars);
         }
-
-        $rule = Route::name(isset($name) ? $name : $url);
-        if ($rule && $match = self::getRuleUrl($rule, $vars)) {
+        if ($url) {
+            $rule = Route::name(isset($name) ? $name : $url);
+        }
+        if (!empty($rule) && $match = self::getRuleUrl($rule, $vars)) {
             // 匹配路由命名标识 快速生成
             $url = $match;
             if (!empty($rule[2])) {