改进Route类的rule方法 合并分组的条件

This commit is contained in:
thinkphp
2016-07-04 11:53:33 +08:00
parent 60850b2de8
commit d6daa4aca8

View File

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