dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Fixed getMainShopDomain

Browse Source
This commit is contained in:
Damien Metzger
2013-07-23 11:33:07 +02:00
parent a805941c1f
commit 0ddf5d1025
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/shop/ShopUrl.php
+9 -12
View File
@@ -34,8 +34,8 @@ class ShopUrlCore extends ObjectModel
public $main; public $main;
public $active; public $active;
protected static $main_domain = null; protected static $main_domain = array();
protected static $main_domain_ssl = null; protected static $main_domain_ssl = array();
/** /**
* @see ObjectModel::$definition * @see ObjectModel::$definition
@@ -145,36 +145,33 @@ class ShopUrlCore extends ObjectModel
public static function cacheMainDomainForShop($id_shop) public static function cacheMainDomainForShop($id_shop)
{ {
if (!Validate::isUnsignedId($id_shop)) if (!isset(self::$main_domain_ssl[(int)$id_shop]) || !isset(self::$main_domain[(int)$id_shop]))
return false;
if (!self::$main_domain_ssl || !self::$main_domain || $id_shop !== null)
{ {
$row = Db::getInstance()->getRow(' $row = Db::getInstance()->getRow('
SELECT domain, domain_ssl SELECT domain, domain_ssl
FROM '._DB_PREFIX_.'shop_url FROM '._DB_PREFIX_.'shop_url
WHERE main = 1 WHERE main = 1
AND id_shop = '.($id_shop !== null ? (int)$id_shop : Context::getContext()->shop->id)); AND id_shop = '.($id_shop !== null ? (int)$id_shop : Context::getContext()->shop->id));
self::$main_domain = $row['domain']; self::$main_domain[(int)$id_shop] = $row['domain'];
self::$main_domain_ssl = $row['domain_ssl']; self::$main_domain_ssl[(int)$id_shop] = $row['domain_ssl'];
} }
} }
public static function resetMainDomainCache() public static function resetMainDomainCache()
{ {
self::$main_domain = null; self::$main_domain = array();
self::$main_domain_ssl = null; self::$main_domain_ssl = array();
} }
public static function getMainShopDomain($id_shop = null) public static function getMainShopDomain($id_shop = null)
{ {
ShopUrl::cacheMainDomainForShop($id_shop); ShopUrl::cacheMainDomainForShop($id_shop);
return self::$main_domain; return self::$main_domain[(int)$id_shop];
} }
public static function getMainShopDomainSSL($id_shop = null) public static function getMainShopDomainSSL($id_shop = null)
{ {
ShopUrl::cacheMainDomainForShop($id_shop); ShopUrl::cacheMainDomainForShop($id_shop);
return self::$main_domain_ssl; return self::$main_domain_ssl[(int)$id_shop];
} }
} }