dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Fix blockmanufacturers

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10475 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rGaillard
2011-11-22 20:51:40 +00:00
parent 13f63f53f7
commit ad9bf8d324
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Manufacturer.php
+2 -1
View File
@@ -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)