diff --git a/library/think/Url.php b/library/think/Url.php index e5a9ec32..c297c5b3 100644 --- a/library/think/Url.php +++ b/library/think/Url.php @@ -240,12 +240,17 @@ class Url if (isset($vars[$key])) { $url = str_replace(['[:' . $key . ']', '<' . $key . '?>', ':' . $key . '', '<' . $key . '>'], $vars[$key], $url); unset($vars[$key]); - return [$url, $domain]; + $result = [$url, $domain]; } elseif (2 == $val) { - $url = str_replace(['/[:' . $key . ']', '[:' . $key . ']', '<' . $key . '?>'], '', $url); - return [$url, $domain]; + $url = str_replace(['/[:' . $key . ']', '[:' . $key . ']', '<' . $key . '?>'], '', $url); + $result = [$url, $domain]; + } else { + break; } } + if (isset($result)) { + return $result; + } } return false; }