From ad9bf8d3242817915063d0ca066688be92417623 Mon Sep 17 00:00:00 2001 From: rGaillard Date: Tue, 22 Nov 2011 20:51:40 +0000 Subject: [PATCH] // Fix blockmanufacturers git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10475 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/Manufacturer.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/classes/Manufacturer.php b/classes/Manufacturer.php index f66a3ae69..56ad6ec0b 100644 --- a/classes/Manufacturer.php +++ b/classes/Manufacturer.php @@ -180,7 +180,8 @@ class ManufacturerCore extends ObjectModel if (!$id_lang) $id_lang = (int)Configuration::get('PS_LANG_DEFAULT'); if (!$id_group_shop) - $id_group_shop = Shop::getGroupFromShop(Configuration::get('PS_SHOP_DEFAULT')); + $id_group_shop = (Context::getContext()->shop->id ? Shop::getGroupFromShop(Context::getContext()->shop->id) : Shop::getGroupFromShop(Configuration::get('PS_SHOP_DEFAULT'))); + $sql = 'SELECT m.*, ml.`description`'; $sql .= 'FROM `'._DB_PREFIX_.'manufacturer_group_shop` mgs LEFT JOIN `'._DB_PREFIX_.'manufacturer` m ON (m.id_manufacturer = mgs.id_manufacturer)