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

改进路由分组为空的情况

Browse Source
This commit is contained in:
thinkphp
2016-01-08 11:26:44 +08:00
parent 24414adfee
commit ac4c0252c6
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
library/think/Route.php
View File

@@ -116,6 +116,9 @@ class Route
$key = array_shift($val); $key = array_shift($val);
} }
if (0 === strpos($key, '[')) { if (0 === strpos($key, '[')) {
if (empty($val)) {
break;
}
self::$rules[$type][substr($key, 1, -1)] = ['routes' => $val, 'option' => $option, 'pattern' => $pattern]; self::$rules[$type][substr($key, 1, -1)] = ['routes' => $val, 'option' => $option, 'pattern' => $pattern];
} elseif (is_array($val)) { } elseif (is_array($val)) {
self::$rules[$type][$key] = ['route' => $val[0], 'option' => $val[1], 'pattern' => $val[2]]; self::$rules[$type][$key] = ['route' => $val[0], 'option' => $val[1], 'pattern' => $val[2]];
@@ -131,7 +134,6 @@ class Route
} else { } else {
self::$rules[$type][$rule] = ['route' => $route, 'option' => $option, 'pattern' => $pattern]; self::$rules[$type][$rule] = ['route' => $route, 'option' => $option, 'pattern' => $pattern];
} }
} }
} }
} }