From 5bc76bbd1412959ec455071027dd7949e199645f Mon Sep 17 00:00:00 2001 From: rMalie Date: Mon, 21 May 2012 22:03:34 +0000 Subject: [PATCH] // Fix share customer on shops git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15589 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/shop/Shop.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/classes/shop/Shop.php b/classes/shop/Shop.php index c52e273ed..0e5255260 100644 --- a/classes/shop/Shop.php +++ b/classes/shop/Shop.php @@ -712,7 +712,8 @@ class ShopCore extends ObjectModel if ($alias) $alias .= '.'; - if ($share == Shop::SHARE_CUSTOMER && Shop::getContext() == Shop::CONTEXT_SHOP) + $group = Shop::getGroupFromShop(Shop::getContextShopID(), false); + if ($share == Shop::SHARE_CUSTOMER && Shop::getContext() == Shop::CONTEXT_SHOP && $group['share_customer']) $restriction = ' AND '.$alias.'id_shop_group = '.(int)Shop::getContextShopGroupID(); else $restriction = ' AND '.$alias.'id_shop IN ('.implode(', ', Shop::getContextListShopID($share)).') ';