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-05-27 12:08:03 +08:00
parent 93c3fe3df7
commit 1fd7d87ee4
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
library/think/Route.php
View File

@@ -199,7 +199,6 @@ class Route
self::rule($rule, $route, $val, $option, $pattern, $group); self::rule($rule, $route, $val, $option, $pattern, $group);
} }
} else { } else {
$rules = [];
if (is_array($rule)) { if (is_array($rule)) {
foreach ($rule as $key => $val) { foreach ($rule as $key => $val) {
if (is_numeric($key)) { if (is_numeric($key)) {
@@ -218,9 +217,7 @@ class Route
} }
} else { } else {
if ($group) { if ($group) {
self::$rules[$type][$group]['option'] = $option; self::$rules[$type][$group]['routes'][$rule] = [$route, $option, $pattern];
self::$rules[$type][$group]['pattern'] = $pattern;
self::$rules[$type][$group]['routes'][$rule] = $route;
} else { } else {
self::$rules[$type][$rule] = ['route' => $route, 'option' => $option, 'pattern' => $pattern]; self::$rules[$type][$rule] = ['route' => $route, 'option' => $option, 'pattern' => $pattern];
} }