From e95b98b3a3f27f0df50f98ecdd167e0fa6b20cae Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Thu, 31 Mar 2016 13:53:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3URL=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/library/think/Url.php b/library/think/Url.php
index 2c2078c6..3494df64 100644
--- a/library/think/Url.php
+++ b/library/think/Url.php
@@ -224,10 +224,14 @@ class Url
                         $url = str_replace(['[:' . $key . ']', '<' . $key . '?>'], '', $url);
                     }
                 }
+                $match = true;
             }
             if (!empty($param) && array_intersect($param, $array) == $param) {
                 $vars = array_diff($array, $param);
                 return $url;
+            } elseif (!empty($match)) {
+                $vars = array_diff($array, $param);
+                return $url;
             }
         }
         return false;