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

修正路由批量注册的一个BUG

Browse Source
This commit is contained in:
thinkphp
2017-08-10 12:25:00 +08:00
parent 2a07b7dbb8
commit fdb5a966ed
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/think/Route.php
View File

@@ -255,9 +255,11 @@ class Route
$option1 = array_merge($option, $val[1]); $option1 = array_merge($option, $val[1]);
$pattern1 = array_merge($pattern, isset($val[2]) ? $val[2] : []); $pattern1 = array_merge($pattern, isset($val[2]) ? $val[2] : []);
} else { } else {
$route = $val; $option1 = null;
$pattern1 = null;
$route = $val;
} }
self::setRule($key, $route, $type, isset($option1) ? $option1 : $option, isset($pattern1) ? $pattern1 : $pattern, $group); self::setRule($key, $route, $type, !is_null($option1) ? $option1 : $option, !is_null($pattern1) ? $pattern1 : $pattern, $group);
} }
} else { } else {
self::setRule($rule, $route, $type, $option, $pattern, $group); self::setRule($rule, $route, $type, $option, $pattern, $group);