MC-19585: CMS page redirects to homepage after changing store view

nikita-shcherbatykh · nikita-shcherbatykh · commit 0788dd4a7404 · 2019-08-30T13:16:11.000+03:00
diff --git a/app/code/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrl.php b/app/code/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrl.php
@@ -111,7 +111,7 @@ private function findCurrentRewrite(UrlRewrite $oldRewrite, StoreInterface $targ
         if (!$currentRewrite) {
             $currentRewrite = $this->urlFinder->findOneByData(
                 [
-                    UrlRewrite::REQUEST_PATH => $oldRewrite->getTargetPath(),
+                    UrlRewrite::REQUEST_PATH => $oldRewrite->getRequestPath(),
                     UrlRewrite::STORE_ID => $targetStore->getId(),
                 ]
             );

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ private function findCurrentRewrite(UrlRewrite $oldRewrite, StoreInterface $targ`
`111`	`111`	`if (!$currentRewrite) {`
`112`	`112`	`$currentRewrite = $this->urlFinder->findOneByData(`
`113`	`113`	`[`
`114`		`- UrlRewrite::REQUEST_PATH => $oldRewrite->getTargetPath(),`
	`114`	`+ UrlRewrite::REQUEST_PATH => $oldRewrite->getRequestPath(),`
`115`	`115`	`UrlRewrite::STORE_ID => $targetStore->getId(),`
`116`	`116`	`]`
`117`	`117`	`);`