From 61856f5e6d5ed69c810183c95ad15b571f308a4d Mon Sep 17 00:00:00 2001
From: Elias Kotlyar <elias.kotlyar@gmail.com>
Date: Tue, 29 May 2018 12:19:46 +0200
Subject: [PATCH 1/2] Fixxes #15565

---
 app/code/Magento/Store/Model/PathConfig.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Store/Model/PathConfig.php b/app/code/Magento/Store/Model/PathConfig.php
index dfe4eee31f9a2..83fa1f2072937 100644
--- 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;
     }
 }

From 4c77dff976361e70fc190c40b1fa5515cd136ce2 Mon Sep 17 00:00:00 2001
From: Vishal Gelani <vishalgelani99@gmail.com>
Date: Tue, 29 May 2018 19:02:13 +0530
Subject: [PATCH 2/2] Fixed coding standard error

---
 app/code/Magento/Store/Model/PathConfig.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Store/Model/PathConfig.php b/app/code/Magento/Store/Model/PathConfig.php
index 83fa1f2072937..6eeb93d7475fa 100644
--- a/app/code/Magento/Store/Model/PathConfig.php
+++ b/app/code/Magento/Store/Model/PathConfig.php
@@ -84,7 +84,7 @@ public function shouldBeSecure($path)
     public function getDefaultPath()
     {
         $store = $this->storeManager->getStore();
-        $value =$this->scopeConfig->getValue('web/default/front', ScopeInterface::SCOPE_STORE,$store);
+        $value = $this->scopeConfig->getValue('web/default/front', ScopeInterface::SCOPE_STORE, $store);
         return $value;
     }
 }