From 5ab581afbebc2e9fb205d667c6cb5ea76599820c Mon Sep 17 00:00:00 2001 From: rMalie Date: Fri, 18 May 2012 15:30:52 +0000 Subject: [PATCH] // Remove useless multishop code in manufacturers #PSCFV-2394 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15395 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/Manufacturer.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/classes/Manufacturer.php b/classes/Manufacturer.php index 7a4560996..1c218302f 100644 --- a/classes/Manufacturer.php +++ b/classes/Manufacturer.php @@ -170,12 +170,6 @@ class ManufacturerCore extends ObjectModel if (!$id_lang) $id_lang = (int)Configuration::get('PS_LANG_DEFAULT'); - if (!$id_shop_group) - if (Context::getContext()->shop->id) - $id_shop_group = Shop::getGroupFromShop(Context::getContext()->shop->id); - else - $id_shop_group = Shop::getGroupFromShop(Configuration::get('PS_SHOP_DEFAULT')); - $sql = 'SELECT m.*, ml.`description` FROM `'._DB_PREFIX_.'manufacturer` m LEFT JOIN `'._DB_PREFIX_.'manufacturer_lang` ml ON (