From 62fa7bd73c55daa96400e86b678fd96945cc4eb8 Mon Sep 17 00:00:00 2001
From: molong <ycgpp@126.com>
Date: Wed, 11 May 2016 10:18:14 +0800
Subject: [PATCH] =?UTF-8?q?URL=E7=94=9F=E6=88=90=E7=9A=84=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AAbug=EF=BC=8C=E5=90=AB=E5=8F=82=E6=95=B0=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/library/think/Url.php b/library/think/Url.php
index 509ef6c6..2987dc44 100644
--- 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;
             }
         }