Do not use store code in URLs when site is in single store mode

peterjaap · web-flow · commit dce6e9d50f5d · 2022-11-03T12:14:48.000+01:00
diff --git a/app/code/Magento/Store/Model/Store.php b/app/code/Magento/Store/Model/Store.php
@@ -21,6 +21,7 @@
 use Magento\Framework\Url\ScopeInterface as UrlScopeInterface;
 use Magento\Framework\UrlInterface;
 use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\StoreManager;
 
 /**
  * Store model
@@ -760,6 +761,7 @@ protected function _updatePathUseStoreView($url)
     public function isUseStoreInUrl()
     {
         return !($this->hasDisableStoreInUrl() && $this->getDisableStoreInUrl())
+            && !$this->getConfig(StoreManager::XML_PATH_SINGLE_STORE_MODE_ENABLED)
             && $this->getConfig(self::XML_PATH_STORE_IN_URL);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`	`use Magento\Framework\Url\ScopeInterface as UrlScopeInterface;`
`22`	`22`	`use Magento\Framework\UrlInterface;`
`23`	`23`	`use Magento\Store\Api\Data\StoreInterface;`
	`24`	`+use Magento\Store\Model\StoreManager;`
`24`	`25`
`25`	`26`	`/**`
`26`	`27`	`* Store model`
`@@ -760,6 +761,7 @@ protected function _updatePathUseStoreView($url)`
`760`	`761`	`public function isUseStoreInUrl()`
`761`	`762`	`{`
`762`	`763`	`return !($this->hasDisableStoreInUrl() && $this->getDisableStoreInUrl())`
	`764`	`+ && !$this->getConfig(StoreManager::XML_PATH_SINGLE_STORE_MODE_ENABLED)`
`763`	`765`	`&& $this->getConfig(self::XML_PATH_STORE_IN_URL);`
`764`	`766`	`}`
`765`	`767`