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

修正Route类的分组参数

Browse Source
This commit is contained in:
thinkphp
2016-06-16 17:32:22 +08:00
parent 46c500db8f
commit bf19ff0d52
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

@@ -225,7 +225,7 @@ class Route
$key = array_shift($val); $key = array_shift($val);
} }
if (is_array($val)) { if (is_array($val)) {
$result = ['route' => $val[0], 'option' => $val[1], 'pattern' => isset($val[2]) ? $val[2] : []]; $result = ['route' => $val[0], 'option' => array_merge($option, $val[1]), 'pattern' => isset($val[2]) ? $val[2] : []];
} else { } else {
$result = ['route' => $val, 'option' => $option, 'pattern' => $pattern]; $result = ['route' => $val, 'option' => $option, 'pattern' => $pattern];
} }