From 902e786a7327bc06effe2425b48f1140ddabb84f Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Mon, 25 Sep 2017 17:05:09 +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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/library/think/Url.php b/library/think/Url.php
index 37ceef1e..8cdd0226 100644
--- a/library/think/Url.php
+++ b/library/think/Url.php
@@ -300,9 +300,10 @@ class Url
             if (empty($pattern)) {
                 return [$url, $domain, $suffix];
             }
+            $type = Config::get('url_common_param');
             foreach ($pattern as $key => $val) {
                 if (isset($vars[$key])) {
-                    $url = str_replace(['[:' . $key . ']', '<' . $key . '?>', ':' . $key . '', '<' . $key . '>'], urlencode($vars[$key]), $url);
+                    $url = str_replace(['[:' . $key . ']', '<' . $key . '?>', ':' . $key . '', '<' . $key . '>'], $type ? $vars[$key] : urlencode($vars[$key]), $url);
                     unset($vars[$key]);
                     $result = [$url, $domain, $suffix];
                 } elseif (2 == $val) {