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

改进路由的 后缀参数识别 优先于系统的伪静态后缀参数

Browse Source
This commit is contained in:
thinkphp
2016-08-22 12:39:07 +08:00
parent 37b329306a
commit c3015bf1c4
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
library/think/Route.php
View File

@@ -864,6 +864,11 @@ class Route
continue; continue;
} }
if (isset($option['ext'])) {
// 路由ext参数 优先于系统配置的URL伪静态后缀参数
$url = preg_replace('/\.' . $request->ext() . '$/i', '', $url);
}
if (is_array($rule)) { if (is_array($rule)) {
// 分组路由 // 分组路由
if (($pos = strpos($key, ':')) || ($pos = strpos($key, '<'))) { if (($pos = strpos($key, ':')) || ($pos = strpos($key, '<'))) {
@@ -1310,7 +1315,7 @@ class Route
// 解析额外参数 // 解析额外参数
self::parseUrlParams(empty($paths) ? '' : implode('/', $paths), $matches); self::parseUrlParams(empty($paths) ? '' : implode('/', $paths), $matches);
// 记录匹配的路由信息 // 记录匹配的路由信息
Request::instance()->routeInfo(['rule' => $rule, 'route' => $route, 'option' => $option]); Request::instance()->routeInfo(['rule' => $rule, 'route' => $route, 'option' => $option, 'var' => $matches]);
// 检测路由after行为 // 检测路由after行为
if (!empty($option['after_behavior'])) { if (!empty($option['after_behavior'])) {
@@ -1382,7 +1387,7 @@ class Route
* @param array $var 变量 * @param array $var 变量
* @return void * @return void
*/ */
private static function parseUrlParams($url, $var = []) private static function parseUrlParams($url, &$var = [])
{ {
if ($url) { if ($url) {
if (Config::get('url_param_type')) { if (Config::get('url_param_type')) {