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-08-02 10:23:47 +08:00
parent b57401eb1e
commit 6e23eb2b44
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/think/Route.php
View File

@@ -345,7 +345,7 @@ class Route
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, array_merge($currentOption, $option), array_merge($currentPattern, $pattern));
call_user_func_array($routes, []); call_user_func_array($routes, []);
self::setGroup($currentGroup, $currentOption, $currentPattern); self::setGroup($currentGroup, $currentOption, $currentPattern);
if ($currentGroup != $name) { if ($currentGroup != $name) {
@@ -362,7 +362,7 @@ class Route
} }
if (is_array($val)) { if (is_array($val)) {
$route = $val[0]; $route = $val[0];
$option1 = array_merge($option, $val[1]); $option1 = array_merge($option, isset($val[1]) ? $val[1] : []);
$pattern1 = array_merge($pattern, isset($val[2]) ? $val[2] : []); $pattern1 = array_merge($pattern, isset($val[2]) ? $val[2] : []);
} else { } else {
$route = $val; $route = $val;
@@ -385,7 +385,7 @@ class Route
// 闭包注册 // 闭包注册
$currentOption = self::getGroup('option'); $currentOption = self::getGroup('option');
$currentPattern = self::getGroup('pattern'); $currentPattern = self::getGroup('pattern');
self::setGroup('', $option, $pattern); self::setGroup('', array_merge($currentOption, $option), array_merge($currentPattern, $pattern));
call_user_func_array($routes, []); call_user_func_array($routes, []);
self::setGroup($currentGroup, $currentOption, $currentPattern); self::setGroup($currentGroup, $currentOption, $currentPattern);
} else { } else {