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

修正路由地址的驼峰定义问题

Browse Source
This commit is contained in:
thinkphp
2016-06-17 12:34:10 +08:00
parent 0955eb18e1
commit 74d32e8ffe
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

@@ -606,7 +606,7 @@ class Route
self::$bind = ['type' => 'group', 'group' => substr($result, 1, -1)]; self::$bind = ['type' => 'group', 'group' => substr($result, 1, -1)];
} else { } else {
// 绑定到模块/控制器 例如 index/user // 绑定到模块/控制器 例如 index/user
self::$bind = ['type' => 'module', 'module' => $result, 'convert' => true]; self::$bind = ['type' => 'module', 'module' => $result];
} }
} }
} }
@@ -853,7 +853,7 @@ class Route
if (!empty($array[1])) { if (!empty($array[1])) {
self::parseUrlParams($array[1]); self::parseUrlParams($array[1]);
} }
return ['type' => 'module', 'module' => $controller . '/' . $action, 'convert' => true]; return ['type' => 'module', 'module' => $controller . '/' . $action];
} }
/** /**
@@ -973,7 +973,7 @@ class Route
if (!empty($result['var'])) { if (!empty($result['var'])) {
$_GET = array_merge($result['var'], $_GET); $_GET = array_merge($result['var'], $_GET);
} }
return ['type' => 'module', 'module' => $result['route'], 'convert' => null]; return ['type' => 'module', 'module' => $result['route']];
} }
/** /**
@@ -1172,7 +1172,7 @@ class Route
// 解析剩余的URL参数 // 解析剩余的URL参数
self::parseUrlParams(implode('/', $paths), $var); self::parseUrlParams(implode('/', $paths), $var);
// 路由到模块/控制器/操作 // 路由到模块/控制器/操作
$result = ['type' => 'module', 'module' => $result['route'], 'convert' => true]; $result = ['type' => 'module', 'module' => $result['route'], 'convert' => false];
} }
return $result; return $result;
} }