diff --git a/Plugin/App/Request/StorePathInfoValidator.php b/Plugin/App/Request/StorePathInfoValidator.php index 4e4cbe1..9bc7b01 100644 --- a/Plugin/App/Request/StorePathInfoValidator.php +++ b/Plugin/App/Request/StorePathInfoValidator.php @@ -32,7 +32,10 @@ public function beforeGetValidStoreCode(Subject $subject, Http $request, string if ($this->config->isEnabled()) { $uri = explode('?', $request->getUriString())[0] . '/'; if ($pathInfo === '') { - $pathInfo = strtok(parse_url($uri, PHP_URL_PATH), '/'); + $pathInfo = parse_url($uri, PHP_URL_PATH); + if ($pathInfo !== false) { + $pathInfo = strtok($pathInfo, '/'); + } } $pathInfo = $pathInfo === false ? $this->resolveByWebUrl($uri) : $this->resolveByLinkUrl($uri, $pathInfo); }