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:39:11 +08:00
parent 0818550b9a
commit 731d0c0002
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
library/think/Route.php
View File

@@ -211,7 +211,7 @@ class Route
public static function rule($rule, $route = '', $type = '*', $option = [], $pattern = []) public static function rule($rule, $route = '', $type = '*', $option = [], $pattern = [])
{ {
$group = self::getGroup('name'); $group = self::getGroup('name');
if (!is_null($group)) { if (!empty($group)) {
// 路由分组 // 路由分组
$option = array_merge(self::getGroup('option'), $option); $option = array_merge(self::getGroup('option'), $option);
$pattern = array_merge(self::getGroup('pattern'), $pattern); $pattern = array_merge(self::getGroup('pattern'), $pattern);
@@ -302,7 +302,7 @@ class Route
if (isset(self::$group[$type])) { if (isset(self::$group[$type])) {
return self::$group[$type]; return self::$group[$type];
} else { } else {
return null; return 'name' == $type ? null : [];
} }
} }
@@ -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);