From 7a9e216caefb022d9e27fe354a7834fe3bacc9f0 Mon Sep 17 00:00:00 2001 From: thinkphp Date: Thu, 7 Jul 2016 14:02:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9BRoute=E7=B1=BB=E8=B7=AF?= =?UTF-8?q?=E7=94=B1=E6=B3=A8=E5=86=8C=E6=9C=BA=E5=88=B6=20=E5=8E=BB?= =?UTF-8?q?=E9=99=A4=E7=9B=B8=E5=90=8C=E7=9A=84=E8=B7=AF=E7=94=B1=E8=A7=84?= =?UTF-8?q?=E5=88=99=E9=81=BF=E5=85=8D=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- library/think/Route.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/library/think/Route.php b/library/think/Route.php index 56153155..87f2bf01 100644 --- a/library/think/Route.php +++ b/library/think/Route.php @@ -269,6 +269,9 @@ class Route if ($group) { self::$rules[$type][$group]['rule'][] = ['rule' => $rule, 'route' => $route, 'var' => $vars, 'option' => $option, 'pattern' => $pattern]; } else { + if ('*' != $type && isset(self::$rules['*'][$rule])) { + unset(self::$rules['*'][$rule]); + } self::$rules[$type][$rule] = ['rule' => $rule, 'route' => $route, 'var' => $vars, 'option' => $option, 'pattern' => $pattern]; } }