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

// Fix #PSCFV-4052

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17349 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rGaillard
2012-09-13 15:23:15 +00:00
parent 9b66df95e2
commit ad7b4f5bf9
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Category.php
+2 -1
View File
@@ -645,7 +645,8 @@ class CategoryCore extends ObjectModel
LEFT JOIN `'._DB_PREFIX_.'manufacturer` m LEFT JOIN `'._DB_PREFIX_.'manufacturer` m
ON m.`id_manufacturer` = p.`id_manufacturer` ON m.`id_manufacturer` = p.`id_manufacturer`
WHERE product_shop.`id_shop` = '.(int)$context->shop->id.' WHERE product_shop.`id_shop` = '.(int)$context->shop->id.'
AND (pa.id_product_attribute IS NULL OR product_attribute_shop.id_product_attribute IS NOT NULL) AND ((product_attribute_shop.id_product_attribute IS NOT NULL OR pa.id_product_attribute IS NULL)
OR (product_attribute_shop.id_product_attribute IS NULL AND pa.default_on=1))
AND cp.`id_category` = '.(int)$this->id AND cp.`id_category` = '.(int)$this->id
.($active ? ' AND product_shop.`active` = 1' : '') .($active ? ' AND product_shop.`active` = 1' : '')
.($front ? ' AND product_shop.`visibility` IN ("both", "catalog")' : '') .($front ? ' AND product_shop.`visibility` IN ("both", "catalog")' : '')
classes/Product.php
+1 -1
View File
@@ -2484,7 +2484,7 @@ class ProductCore extends ObjectModel
$sql->where('p.`id_product` = '.(int)$id_product); $sql->where('p.`id_product` = '.(int)$id_product);
if (Combination::isFeatureActive()) if (Combination::isFeatureActive())
{ {
$sql->select('pa.id_product_attribute, product_attribute_shop.`price` AS attribute_price, product_attribute_shop.default_on'); $sql->select('product_attribute_shop.id_product_attribute, product_attribute_shop.`price` AS attribute_price, product_attribute_shop.default_on');
$sql->leftJoin('product_attribute', 'pa', 'pa.`id_product` = p.`id_product`'); $sql->leftJoin('product_attribute', 'pa', 'pa.`id_product` = p.`id_product`');
$sql->join(Shop::addSqlAssociation('product_attribute', 'pa', false, 'product_attribute_shop.id_shop = p.id_shop_default')); $sql->join(Shop::addSqlAssociation('product_attribute', 'pa', false, 'product_attribute_shop.id_shop = p.id_shop_default'));
} }