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

修正Route类

Browse Source
This commit is contained in:
thinkphp
2016-05-26 22:38:52 +08:00
parent 468222c4b8
commit fa8aac7c13
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/think/Route.php
View File

@@ -936,7 +936,7 @@ class Route
private static function match($url, $rule, $pattern, $merge) private static function match($url, $rule, $pattern, $merge)
{ {
$m2 = explode('/', $rule); $m2 = explode('/', $rule);
$m1 = explode('/', $url, $merge ? count($m2) : null); $m1 = $merge ? explode('/', $url, count($m2)) : explode('/', $url);
$var = []; $var = [];
foreach ($m2 as $key => $val) { foreach ($m2 as $key => $val) {
@@ -993,12 +993,12 @@ class Route
* @param bool $merge 合并额外变量 * @param bool $merge 合并额外变量
* @return array * @return array
*/ */
private static function parseRule($rule, $route, $pathinfo, $matches, $merge) private static function parseRule($rule, $route, $pathinfo, $matches, $merge = false)
{ {
// 解析路由规则 // 解析路由规则
$rule = explode('/', $rule); $rule = explode('/', $rule);
// 获取URL地址中的参数 // 获取URL地址中的参数
$paths = explode('/', $pathinfo, $merge ? count($rule) : null); $paths = $merge ? explode('/', $pathinfo, count($rule)) : explode('/', $pathinfo);
// 获取路由地址规则 // 获取路由地址规则
$url = is_array($route) ? $route[0] : $route; $url = is_array($route) ? $route[0] : $route;