改进Url类对路由到类的方法的支持

This commit is contained in:
thinkphp
2016-01-19 12:18:52 +08:00
parent 43049a244b
commit a8e4ee762f

View File

@@ -24,7 +24,7 @@ class Url
* @param boolean|string $domain 是否显示域名 或者直接传入域名 * @param boolean|string $domain 是否显示域名 或者直接传入域名
* @return string * @return string
*/ */
public static function build($url = '', $vars = '', $suffix = true, $domain = true) public static function build($url = '', $vars = '', $suffix = true, $domain = false)
{ {
// 解析参数 // 解析参数
if (is_string($vars)) { if (is_string($vars)) {
@@ -226,7 +226,9 @@ class Url
$key = array_shift($route); $key = array_shift($route);
} }
$route = $route[0]; $route = $route[0];
if (strpos($route, '?')) { if (is_array($route)) {
$route = implode('\\', $route);
} elseif (strpos($route, '?')) {
$route = strstr($route, '?', true); $route = strstr($route, '?', true);
} }
$var = self::parseVar($rule . '/' . $key); $var = self::parseVar($rule . '/' . $key);
@@ -234,7 +236,9 @@ class Url
} }
} else { } else {
$route = $val['route']; $route = $val['route'];
if (strpos($route, '?')) { if (is_array($route)) {
$route = implode('\\', $route);
} elseif (strpos($route, '?')) {
$route = strstr($route, '?', true); $route = strstr($route, '?', true);
} }
$var = self::parseVar($rule); $var = self::parseVar($rule);