// 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
This commit is contained in:
dMetzger
2012-09-12 17:22:43 +00:00
parent 8111cbb53c
commit ed3ef17b00
+2 -1
View File
@@ -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);