From 24a5ed1cb9ec29ae7e28f647bdb70d2f333b21c9 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Tue, 23 Aug 2016 18:24:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9BUrl=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/library/think/Url.php b/library/think/Url.php
index e5a9ec32..c297c5b3 100644
--- a/library/think/Url.php
+++ b/library/think/Url.php
@@ -240,12 +240,17 @@ class Url
                 if (isset($vars[$key])) {
                     $url = str_replace(['[:' . $key . ']', '<' . $key . '?>', ':' . $key . '', '<' . $key . '>'], $vars[$key], $url);
                     unset($vars[$key]);
-                    return [$url, $domain];
+                    $result = [$url, $domain];
                 } elseif (2 == $val) {
-                    $url = str_replace(['/[:' . $key . ']', '[:' . $key . ']', '<' . $key . '?>'], '', $url);
-                    return [$url, $domain];
+                    $url    = str_replace(['/[:' . $key . ']', '[:' . $key . ']', '<' . $key . '?>'], '', $url);
+                    $result = [$url, $domain];
+                } else {
+                    break;
                 }
             }
+            if (isset($result)) {
+                return $result;
+            }
         }
         return false;
     }