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

修正Url类build方法定义路由别名后的BUG

Browse Source
This commit is contained in:
thinkphp
2016-12-24 20:23:15 +08:00
parent 5fe605705d
commit 7625aa9321
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
library/think/Url.php
View File

@@ -89,7 +89,8 @@ class Url
throw new \InvalidArgumentException('route name not exists:' . $name); throw new \InvalidArgumentException('route name not exists:' . $name);
} else { } else {
// 检查别名路由 // 检查别名路由
$alias = Route::rules('alias'); $alias = Route::rules('alias');
$matchAlias = false;
if ($alias) { if ($alias) {
// 别名路由解析 // 别名路由解析
foreach ($alias as $key => $val) { foreach ($alias as $key => $val) {
@@ -97,11 +98,13 @@ class Url
$val = $val[0]; $val = $val[0];
} }
if (0 === strpos($url, $val)) { if (0 === strpos($url, $val)) {
$url = $key . substr($url, strlen($val)); $url = $key . substr($url, strlen($val));
$matchAlias = true;
break; break;
} }
} }
} else { }
if (!$matchAlias) {
// 路由标识不存在 直接解析 // 路由标识不存在 直接解析
$url = self::parseUrl($url, $domain); $url = self::parseUrl($url, $domain);
} }