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

改进路由分组和虚拟分组 混合使用的情况

Browse Source
This commit is contained in:
thinkphp
2016-08-01 12:21:04 +08:00
parent 3a74ba89c4
commit 9762cd370e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
library/think/Route.php
View File

@@ -340,7 +340,6 @@ class Route
$name = $currentGroup . '/' . ltrim($name, '/'); $name = $currentGroup . '/' . ltrim($name, '/');
} }
if ($routes instanceof \Closure) { if ($routes instanceof \Closure) {
$currentOption = self::getGroup('option'); $currentOption = self::getGroup('option');
$currentPattern = self::getGroup('pattern'); $currentPattern = self::getGroup('pattern');
self::setGroup($name, $option, $pattern); self::setGroup($name, $option, $pattern);
@@ -350,7 +349,6 @@ class Route
self::$rules['*'][$name]['var'] = self::parseVar($name); self::$rules['*'][$name]['var'] = self::parseVar($name);
self::$rules['*'][$name]['option'] = $option; self::$rules['*'][$name]['option'] = $option;
self::$rules['*'][$name]['pattern'] = $pattern; self::$rules['*'][$name]['pattern'] = $pattern;
} else { } else {
foreach ($routes as $key => $val) { foreach ($routes as $key => $val) {
if (is_numeric($key)) { if (is_numeric($key)) {
@@ -383,6 +381,9 @@ class Route
$currentGroup = self::getGroup('name'); $currentGroup = self::getGroup('name');
$currentOption = self::getGroup('option'); $currentOption = self::getGroup('option');
$currentPattern = self::getGroup('pattern'); $currentPattern = self::getGroup('pattern');
if ($currentGroup) {
$name = $currentGroup . '/' . ltrim($name, '/');
}
self::setGroup($name, $option, $pattern); self::setGroup($name, $option, $pattern);
call_user_func_array($routes, []); call_user_func_array($routes, []);
self::setGroup($currentGroup, $currentOption, $currentPattern); self::setGroup($currentGroup, $currentOption, $currentPattern);