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

修正路由分组的参数覆盖问题

Browse Source
This commit is contained in:
thinkphp
2016-06-16 17:21:30 +08:00
parent d29b17b28b
commit 46c500db8f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/think/Route.php
View File

@@ -211,7 +211,7 @@ class Route
public static function rule($rule, $route = '', $type = '*', $option = [], $pattern = [], $group = '') public static function rule($rule, $route = '', $type = '*', $option = [], $pattern = [], $group = '')
{ {
$group = $group ?: self::$group; $group = $group ?: self::$group;
$option = $option ?: self::$option; $option = $option ? array_merge(self::$option, $option) : self::$option;
$type = strtoupper($type); $type = strtoupper($type);
if (strpos($type, '|')) { if (strpos($type, '|')) {