From b0861629432ccc998bf979cea2ae840f598744b7 Mon Sep 17 00:00:00 2001 From: Moritz Demmer Date: Thu, 10 Oct 2024 15:28:53 +0200 Subject: [PATCH] OXDEV-7963 Update ShopIdCalculator to use SSL config values --- CHANGELOG-7.3.md | 5 ++++- source/Core/ShopIdCalculator.php | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG-7.3.md b/CHANGELOG-7.3.md index 24af1acd53..970ce727d1 100644 --- a/CHANGELOG-7.3.md +++ b/CHANGELOG-7.3.md @@ -1,3 +1,6 @@ # Change Log for OXID eShop Community Edition Core Component -## v7.3.0 - unreleased \ No newline at end of file +## v7.3.0 - unreleased + +### Fixed +- Shop ID resolution considers SSL language URLs \ No newline at end of file diff --git a/source/Core/ShopIdCalculator.php b/source/Core/ShopIdCalculator.php index f3b11f0d0b..b617edc4b8 100644 --- a/source/Core/ShopIdCalculator.php +++ b/source/Core/ShopIdCalculator.php @@ -66,7 +66,7 @@ protected function getShopUrlMap() $sSelect = " SELECT oxshopid, oxvarname, oxvarvalue FROM oxconfig - WHERE oxvarname IN ('aLanguageURLs','sMallShopURL','sMallSSLShopURL')"; + WHERE oxvarname IN ('aLanguageURLs','aLanguageSSLURLs','sMallShopURL','sMallSSLShopURL')"; // We force reading from master to prevent issues with slow replications or open transactions (see ESDEV-3804). $masterDb = \OxidEsales\Eshop\Core\DatabaseProvider::getMaster(); @@ -78,7 +78,7 @@ protected function getShopUrlMap() $sVar = $oRs->fields[1]; $sURL = $oRs->fields[2]; - if ($sVar == 'aLanguageURLs') { + if ($sVar == 'aLanguageURLs' || $sVar === 'aLanguageSSLURLs') { $aUrls = unserialize($sURL); if (is_array($aUrls) && count($aUrls)) { $aUrls = array_filter($aUrls);