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

优化Router代码 顺便问一下,url中静态变量是不是在没有设置merge_extra_vars时应该不可用,路由应该判断为错误

Browse Source
This commit is contained in:
cnbailian
2017-01-10 11:07:01 +08:00
parent 7cb833ae45
commit 390077500d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/think/Route.php
View File

@@ -1164,7 +1164,7 @@ class Route
$len1 = substr_count($url, '|'); $len1 = substr_count($url, '|');
$len2 = substr_count($rule, '/'); $len2 = substr_count($rule, '/');
// 多余参数是否合并 // 多余参数是否合并
$merge = !empty($option['merge_extra_vars']) ? true : false; $merge = !empty($option['merge_extra_vars']);
if ($merge && $len1 > $len2) { if ($merge && $len1 > $len2) {
$url = str_replace('|', $depr, $url); $url = str_replace('|', $depr, $url);
$url = implode('|', explode($depr, $url, $len2 + 1)); $url = implode('|', explode($depr, $url, $len2 + 1));