Merge pull request #21 from vgelani/2.3-develop-PR-port-15566

gelanivishal · web-flow · commit 95a645411af8 · 2018-06-04T15:57:52.000+05:30
[Forwardport] Fixxes magento#15565
diff --git a/app/code/Magento/Store/Model/PathConfig.php b/app/code/Magento/Store/Model/PathConfig.php
@@ -83,6 +83,8 @@ public function shouldBeSecure($path)
      */
     public function getDefaultPath()
     {
-        return $this->scopeConfig->getValue('web/default/front', ScopeInterface::SCOPE_STORE);
+        $store = $this->storeManager->getStore();
+        $value = $this->scopeConfig->getValue('web/default/front', ScopeInterface::SCOPE_STORE, $store);
+        return $value;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,8 @@ public function shouldBeSecure($path)`
`83`	`83`	`*/`
`84`	`84`	`public function getDefaultPath()`
`85`	`85`	`{`
`86`		`- return $this->scopeConfig->getValue('web/default/front', ScopeInterface::SCOPE_STORE);`
	`86`	`+ $store = $this->storeManager->getStore();`
	`87`	`+ $value = $this->scopeConfig->getValue('web/default/front', ScopeInterface::SCOPE_STORE, $store);`
	`88`	`+ return $value;`
`87`	`89`	`}`
`88`	`90`	`}`