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-02 10:25:18 +08:00
parent 6e23eb2b44
commit 0818550b9a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
library/think/Route.php
View File

@@ -343,8 +343,8 @@ class Route
} }
if (!empty($name)) { if (!empty($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, array_merge($currentOption, $option), array_merge($currentPattern, $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);
@@ -383,8 +383,8 @@ class Route
} elseif ($routes instanceof \Closure) { } elseif ($routes instanceof \Closure) {
// 闭包注册 // 闭包注册
$currentOption = self::getGroup('option'); $currentOption = self::getGroup('option') ?: [];
$currentPattern = self::getGroup('pattern'); $currentPattern = self::getGroup('pattern') ?: [];
self::setGroup('', array_merge($currentOption, $option), array_merge($currentPattern, $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);