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

修正完整URL规则检测

Browse Source
This commit is contained in:
thinkphp
2016-10-07 15:26:55 +08:00
parent 8490413098
commit 2dc434435e
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
library/think/Route.php
View File

@@ -1103,13 +1103,12 @@ class Route
private static function checkRule($rule, $route, $url, $pattern, $option, $depr) private static function checkRule($rule, $route, $url, $pattern, $option, $depr)
{ {
// 检查完整规则定义 // 检查完整规则定义
if (isset($pattern['__url__']) && !preg_match('/^' . $pattern['__url__'] . '/', $url)) { if (isset($pattern['__url__']) && !preg_match('/^' . $pattern['__url__'] . '/', str_replace('|', $depr, $url))) {
return false; return false;
} }
// 检查路由的参数分隔符 // 检查路由的参数分隔符
if (isset($option['param_depr'])) { if (isset($option['param_depr'])) {
$url = str_replace('|', $depr, $url); $url = str_replace(['|', $option['param_depr']], [$depr, '|'], $url);
$url = str_replace($option['param_depr'], '|', $url);
} }
$len1 = substr_count($url, '|'); $len1 = substr_count($url, '|');