Merge pull request #17 from experius/lewisvoncken-patch-2

[BUGFIX] Solved invalid redirect url when the base url is different
experius · Nov 18, 2020 · 07bffbf · 07bffbf
2 parents b2d100f + 3a15012
commit 07bffbf
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/Plugin/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrl.php b/Plugin/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrl.php
@@ -67,6 +67,10 @@ public function beforeSwitch(
         $temp = explode('/',$redirectUrlTemp,5);
         if (rtrim($temp[3],'/') ==  rtrim(end($temp),'/'))
         {
+            if (strpos(rtrim($redirectUrl, '/'), rtrim($targetStore->getBaseUrl(),'/')) === false) {
+                $redirectUrl = $targetStore->getBaseUrl();
+                return [$fromStore,$targetStore,$redirectUrl];
+            }
             return $return;
         }
         unset($temp);