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

改进Route类

Browse Source
This commit is contained in:
thinkphp
2016-02-01 09:41:30 +08:00
parent d8dfba1bfd
commit 35be826195
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
library/think/Route.php
View File

@@ -392,8 +392,9 @@ class Route
} }
$pattern = array_merge($pattern, isset($route[2]) ? $route[2] : []); $pattern = array_merge($pattern, isset($route[2]) ? $route[2] : []);
$route = $route[0]; $route = $route[0];
$option = array_merge($option, $option1);
} }
$result = self::checkRule($key, $route, $url1, $pattern, $option1); $result = self::checkRule($key, $route, $url1, $pattern, $option);
if (false !== $result) { if (false !== $result) {
return $result; return $result;
} }