From 2dc434435e8420fed79be5eebef6886b5d1e951e Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Fri, 7 Oct 2016 15:26:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=AE=8C=E6=95=B4URL?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E6=A3=80=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Route.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/library/think/Route.php b/library/think/Route.php
index 3db38183..2a454af7 100644
--- a/library/think/Route.php
+++ b/library/think/Route.php
@@ -1103,13 +1103,12 @@ class Route
     private static function checkRule($rule, $route, $url, $pattern, $option, $depr)
     {
         // 检查完整规则定义
-        if (isset($pattern['__url__']) && !preg_match('/^' . $pattern['__url__'] . '/', $url)) {
+        if (isset($pattern['__url__']) && !preg_match('/^' . $pattern['__url__'] . '/', str_replace('|', $depr, $url))) {
             return false;
         }
         // 检查路由的参数分隔符
         if (isset($option['param_depr'])) {
-            $url = str_replace('|', $depr, $url);
-            $url = str_replace($option['param_depr'], '|', $url);
+            $url = str_replace(['|', $option['param_depr']], [$depr, '|'], $url);
         }
 
         $len1 = substr_count($url, '|');