// @DO - do not use Store Cookie for Store Resolving. Causes issues when set incorrectly. diff --git a/vendor/magento/module-store/Model/StoreCookieManager.php b/vendor/magento/module-store/Model/StoreCookieManager.php index acf8739..23e08cd 100644 --- a/vendor/magento/module-store/Model/StoreCookieManager.php +++ b/vendor/magento/module-store/Model/StoreCookieManager.php @@ -49,7 +49,7 @@ class StoreCookieManager implements StoreCookieManagerInterface */ public function getStoreCodeFromCookie() { - return $this->cookieManager->getCookie(self::COOKIE_NAME); + return null; } /** @@ -57,13 +57,6 @@ class StoreCookieManager implements StoreCookieManagerInterface */ public function setStoreCookie(StoreInterface $store) { - $cookieMetadata = $this->cookieMetadataFactory->createPublicCookieMetadata() - ->setHttpOnly(false) - ->setDurationOneYear() - ->setPath($store->getStorePath()) - ->setSameSite('Lax'); - - $this->cookieManager->setPublicCookie(self::COOKIE_NAME, $store->getCode(), $cookieMetadata); } /**