#11211 Fix Store View switcher

magento · Oct 10, 2017 · ce4fb97 · ce4fb97
1 parent 9304040
commit ce4fb97
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/app/code/Magento/Store/Model/Store.php b/app/code/Magento/Store/Model/Store.php
@@ -1166,6 +1166,9 @@ public function getCurrentUrl($fromStore = true)
         if (!$this->isUseStoreInUrl()) {
             $storeParsedQuery['___store'] = $this->getCode();
         }
+        if ($this->getCode() !== $this->_storeManager->getStore()->getCode()) {
+            $fromStore = true;
+        }
         if ($fromStore !== false) {
             $storeParsedQuery['___from_store'] = $fromStore ===
                 true ? $this->_storeManager->getStore()->getCode() : $fromStore;
@@ -1175,9 +1178,14 @@ public function getCurrentUrl($fromStore = true)
             . '://'
             . $storeParsedUrl['host']
             . (isset($storeParsedUrl['port']) ? ':' . $storeParsedUrl['port'] : '')
-            . $storeParsedUrl['path']
-            . $requestString
-            . ($storeParsedQuery ? '?' . http_build_query($storeParsedQuery, '', '&amp;') : '');
+            . $storeParsedUrl['path'];
+
+        //avoid query params duplication
+        if (!preg_match('/___store=(.*?)&___from_store=(.*?)/', $requestString)) {
+            $currentUrl .= $requestString;
+        }
+
+        $currentUrl .= ($storeParsedQuery ? '?' . http_build_query($storeParsedQuery, '', '&amp;') : '');
 
         return $currentUrl;
     }