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

// Fix shop->id in Carrier

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13589 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie committed 2012-02-24 09:34:54 +00:00
1 parent f228b01da2
commit d3a7ead1e2
1 file changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files
classes/Carrier.php
+4 -4
View File
@@ -917,14 +917,14 @@ class CarrierCore extends ObjectModel
{ {
if (!$context) if (!$context)
$context = Context::getContext(); $context = Context::getContext();
if (!Cache::isStored((int)$id_carrier.'_'.(int)$context->shop->getId(true))) if (!Cache::isStored((int)$id_carrier.'_'.(int)$context->shop->id))
Cache::store((int)$id_carrier.'_'.(int)$context->shop->getId(true), Cache::store((int)$id_carrier.'_'.(int)$context->shop->id,
Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue(' Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
SELECT `id_tax_rules_group` SELECT `id_tax_rules_group`
FROM `'._DB_PREFIX_.'carrier_tax_rules_group_shop` FROM `'._DB_PREFIX_.'carrier_tax_rules_group_shop`
WHERE `id_carrier` = '.(int)$id_carrier.' AND id_shop='.(int)Context::getContext()->shop->getId(true))); WHERE `id_carrier` = '.(int)$id_carrier.' AND id_shop='.(int)Context::getContext()->shop->id));
return Cache::retrieve((int)$id_carrier.'_'.(int)$context->shop->getId(true)); return Cache::retrieve((int)$id_carrier.'_'.(int)$context->shop->id);
} }