// 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
This commit is contained in:
rMalie
2012-05-18 15:30:52 +00:00
parent 2fd7807ae5
commit 5ab581afbe
-6
View File
@@ -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 (