ENGCOM-2444: Resolve incorrect scope code selection when the requeste…

…d scopeCode is null #16940
magento · Oct 22, 2018 · 59d1e79 · 59d1e79
1 parent 2b88239
commit 59d1e79
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/app/code/Magento/Store/Model/StoreManager.php b/app/code/Magento/Store/Model/StoreManager.php
@@ -234,11 +234,11 @@ public function getWebsites($withDefault = false, $codeKey = false)
     public function reinitStores()
     {
         $this->currentStoreId = null;
-        $this->cache->clean(\Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG, [StoreResolver::CACHE_TAG, Store::CACHE_TAG]);
-        $this->scopeConfig->clean();
         $this->storeRepository->clean();
         $this->websiteRepository->clean();
         $this->groupRepository->clean();
+        $this->cache->clean(\Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG, [StoreResolver::CACHE_TAG, Store::CACHE_TAG]);
+        $this->scopeConfig->clean();
     }
 
     /**