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

修正

Browse Source
This commit is contained in:
thinkphp
2016-06-16 18:26:24 +08:00
parent bbb53484bc
commit 0eaf681208
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/think/Route.php
View File

@@ -719,7 +719,7 @@ 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); $option = array_merge($option, $option1);
}dump($option); }
$result = self::checkRule($key, $route, $url, $pattern, $option); $result = self::checkRule($key, $route, $url, $pattern, $option);
if (false !== $result) { if (false !== $result) {
$request->route(['rule' => $key, 'route' => $route, 'pattern' => $pattern, 'option' => $option]); $request->route(['rule' => $key, 'route' => $route, 'pattern' => $pattern, 'option' => $option]);