Skip to content

Commit

Permalink
OXDEV-7963 Update ShopIdCalculator to use SSL config values
Browse files Browse the repository at this point in the history
  • Loading branch information
moritzdemmer committed Oct 23, 2024
1 parent 7327258 commit b086162
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG-7.3.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Change Log for OXID eShop Community Edition Core Component

## v7.3.0 - unreleased
## v7.3.0 - unreleased

### Fixed
- Shop ID resolution considers SSL language URLs
4 changes: 2 additions & 2 deletions source/Core/ShopIdCalculator.php
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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);
Expand Down

0 comments on commit b086162

Please sign in to comment.