updated core to 1.7.16

This commit is contained in:
2021-06-10 16:04:05 +02:00
parent 7a4bfa16c8
commit 6dfae7006b
15 changed files with 140 additions and 51 deletions

View File

@@ -665,7 +665,7 @@ class Uri
*/
public static function paramsRegex()
{
return '/\/([^\:\#\/\?]*' . Grav::instance()['config']->get('system.param_sep') . '[^\:\#\/\?]*)/';
return '/\/{1,}([^\:\#\/\?]*' . Grav::instance()['config']->get('system.param_sep') . '[^\:\#\/\?]*)/';
}
/**
@@ -1498,7 +1498,7 @@ class Uri
* @param string $delimiter
* @return string
*/
private function processParams($uri, $delimiter = ':')
private function processParams(string $uri, string $delimiter = ':'): string
{
if (strpos($uri, $delimiter) !== false) {
preg_match_all(static::paramsRegex(), $uri, $matches, PREG_SET_ORDER);