From ed3ef17b002ae49eabde48e1f924ca6fa5331d34 Mon Sep 17 00:00:00 2001 From: dMetzger Date: Wed, 12 Sep 2012 17:22:43 +0000 Subject: [PATCH] // Fixed bug in multishop when multishipping is not activated: sometimes the multishipping was "forced" in the cart git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17314 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/Cart.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/classes/Cart.php b/classes/Cart.php index 0ba07f812..23938f907 100644 --- a/classes/Cart.php +++ b/classes/Cart.php @@ -3333,7 +3333,8 @@ class CartCore extends ObjectModel WHERE `id_cart` = '.(int)$this->id.' AND `id_shop` = '.(int)$this->id_shop.' ) - WHERE `id_cart` = '.(int)$this->id.' AND `id_shop` = '.(int)$this->id_shop; + WHERE `id_cart` = '.(int)$this->id.' + '.(Configuration::get('PS_ALLOW_MULTISHIPPING') ? ' AND `id_shop` = '.(int)$this->id_shop : ''); Db::getInstance()->execute($sql);