mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-07 23:22:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

调整Route类两处不再使用的参数

Browse Source
This commit is contained in:
thinkphp
2017-03-24 12:37:20 +08:00
parent 05be8d9664
commit f9cfb6ef3b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
library/think/Route.php
View File

@@ -1184,9 +1184,9 @@ class Route
} }
} }
$pattern = array_merge(self::$rules['pattern'], $pattern); $pattern = array_merge(self::$rules['pattern'], $pattern);
if (false !== $match = self::match($url, $rule, $pattern, $merge)) { if (false !== $match = self::match($url, $rule, $pattern)) {
// 匹配到路由规则 // 匹配到路由规则
return self::parseRule($rule, $route, $url, $option, $match, $merge); return self::parseRule($rule, $route, $url, $option, $match);
} }
} }
return false; return false;