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

url_controller_convert 和 url_action_convert 合并为 url_convert 参数 改进Route类对url_convert的支持

Browse Source
This commit is contained in:
thinkphp
2016-06-17 00:07:34 +08:00
parent 0eaf681208
commit 402bd9282a
4 changed files with 69 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
library/think/Route.php
View File

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