Skip to content

Commit fbaac31

Browse files
MAGETWO-57337: Store View (language) switch leads to 404
- Redirect to home page if we haven't rewrite for target store (from old)
1 parent 5569b86 commit fbaac31

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

app/code/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrl.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,12 @@ public function switch(StoreInterface $fromStore, StoreInterface $targetStore, s
8181
$existingRewrite = $this->urlFinder->findOneByData([
8282
UrlRewrite::REQUEST_PATH => $urlPath
8383
]);
84-
if ($existingRewrite) {
84+
$currentRewrite = $this->urlFinder->findOneByData([
85+
UrlRewrite::REQUEST_PATH => $urlPath,
86+
UrlRewrite::STORE_ID => $targetStore->getId(),
87+
]);
88+
89+
if ($existingRewrite && !$currentRewrite) {
8590
/** @var \Magento\Framework\App\Response\Http $response */
8691
$targetUrl = $targetStore->getBaseUrl();
8792
}

0 commit comments

Comments
 (0)