From b0ce37b290d6a3d0bf46260f0a1d97a6abb30e43 Mon Sep 17 00:00:00 2001
From: rMalie <raphael.malie@prestashop.com>
Date: Fri, 24 Feb 2012 09:34:54 +0000
Subject: [PATCH] // Fix shop->id in Carrier

---
 classes/Carrier.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/classes/Carrier.php b/classes/Carrier.php
index b56d52739..8a352cdc8 100644
--- a/classes/Carrier.php
+++ b/classes/Carrier.php
@@ -917,14 +917,14 @@ class CarrierCore extends ObjectModel
 	{
 		if (!$context)
 			$context = Context::getContext();
-		if (!Cache::isStored((int)$id_carrier.'_'.(int)$context->shop->getId(true)))
-			Cache::store((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->id,
 			Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
 				SELECT `id_tax_rules_group`
 				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);
 	}