Update Store.php

Author: thomas-kl1

app/code/Magento/Store/Model/Store.php

@@ -801,16 +801,24 @@ public function isUrlSecure()
     /**
      * Check if request was secure
      *
-     * @return boolean
+     * @return bool
      */
     public function isCurrentlySecure()
     {
         if ($this->_request->isSecure()) {
             return true;
         }
 
-        $secureBaseUrl = $this->_config->getValue(self::XML_PATH_SECURE_BASE_URL, ScopeInterface::SCOPE_STORE);
-        $secureFrontend = $this->_config->getValue(self::XML_PATH_SECURE_IN_FRONTEND, ScopeInterface::SCOPE_STORE);
+        $secureBaseUrl = $this->_config->getValue(
+            self::XML_PATH_SECURE_BASE_URL,
+            ScopeInterface::SCOPE_STORE,
+            $this->getId()
+        );
+        $secureFrontend = $this->_config->getValue(
+            self::XML_PATH_SECURE_IN_FRONTEND,
+            ScopeInterface::SCOPE_STORE,
+            $this->getId()
+        );
 
         if (!$secureBaseUrl || !$secureFrontend) {
             return false;
@@ -819,8 +827,8 @@ public function isCurrentlySecure()
         $uri = UriFactory::factory($secureBaseUrl);
         $port = $uri->getPort();
         $serverPort = $this->_request->getServer('SERVER_PORT');
-        $isSecure = $uri->getScheme() == 'https' && isset($serverPort) && $port == $serverPort;
-        return $isSecure;
+
+        return $uri->getScheme() == 'https' && isset($serverPort) && $port == $serverPort;
     }
 
     /*************************************************************************************