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

修正Url类一处Bug

Browse Source
This commit is contained in:
thinkphp
2016-08-23 18:11:28 +08:00
parent 369bbc9d99
commit 64bea5c8d2
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
library/think/Url.php
View File

@@ -78,9 +78,9 @@ class Url
} }
if (!empty($rule) && $match = self::getRuleUrl($rule, $vars)) { if (!empty($rule) && $match = self::getRuleUrl($rule, $vars)) {
// 匹配路由命名标识 快速生成 // 匹配路由命名标识 快速生成
$url = $match; $url = $match[0];
if (!empty($rule[2])) { if (!empty($match[1])) {
$domain = $rule[2]; $domain = $match[1];
} }
} elseif (!empty($rule) && isset($name)) { } elseif (!empty($rule) && isset($name)) {
throw new \InvalidArgumentException('route name not exists:' . $name); throw new \InvalidArgumentException('route name not exists:' . $name);
@@ -235,14 +235,15 @@ class Url
public static function getRuleUrl($rule, &$vars = []) public static function getRuleUrl($rule, &$vars = [])
{ {
foreach ($rule as $item) { foreach ($rule as $item) {
list($url, $pattern) = $item; list($url, $pattern, $domain) = $item;
foreach ($pattern as $key => $val) { foreach ($pattern as $key => $val) {
if (isset($vars[$key])) { if (isset($vars[$key])) {
$url = str_replace(['[:' . $key . ']', '<' . $key . '?>', ':' . $key . '', '<' . $key . '>'], $vars[$key], $url); $url = str_replace(['[:' . $key . ']', '<' . $key . '?>', ':' . $key . '', '<' . $key . '>'], $vars[$key], $url);
unset($vars[$key]); unset($vars[$key]);
return $url; return [$url, $domain];
} elseif (2 == $val) { } elseif (2 == $val) {
return str_replace(['/[:' . $key . ']', '[:' . $key . ']', '<' . $key . '?>'], '', $url); $url = str_replace(['/[:' . $key . ']', '[:' . $key . ']', '<' . $key . '?>'], '', $url);
return [$url, $domain];
} }
} }
} }