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

修正Route类一处BUG

Browse Source
This commit is contained in:
thinkphp
2016-05-20 19:13:11 +08:00
parent 26270b2ca9
commit 277e253e44
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
library/think/Route.php
View File

@@ -469,11 +469,15 @@ class Route
if (!empty($val['routes'])) { if (!empty($val['routes'])) {
// 分组路由 // 分组路由
if ($pos = strpos($rule, ':')) { if ($pos = strpos($rule, ':')) {
$str = substr($rule, 0, $pos); $str = substr($rule, 0, $pos);
$key1 = substr($rule, $pos) . '/';
} elseif ($pos = strpos($rule, '<')) { } elseif ($pos = strpos($rule, '<')) {
$str = substr($rule, 0, $pos); $str = substr($rule, 0, $pos);
$key1 = substr($rule, $pos) . '/';
} else { } else {
$str = $rule; $pos = strlen($rule) + 1;
$key1 = '';
$str = $rule;
} }
if (0 !== strpos($url, $str)) { if (0 !== strpos($url, $str)) {
continue; continue;
@@ -483,7 +487,9 @@ class Route
if (is_numeric($key)) { if (is_numeric($key)) {
$key = array_shift($route); $key = array_shift($route);
} }
$url1 = substr($url, strlen($rule) + 1); $url1 = substr($url, $pos);
$key = $key1 . $key;
// 检查规则路由 // 检查规则路由
if (is_array($route)) { if (is_array($route)) {
$option1 = $route[1]; $option1 = $route[1];