From ad7b4f5bf9c78e69f5c2f60f6af83cf642ff04aa Mon Sep 17 00:00:00 2001 From: rGaillard Date: Thu, 13 Sep 2012 15:23:15 +0000 Subject: [PATCH] // Fix #PSCFV-4052 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17349 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/Category.php | 3 ++- classes/Product.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/classes/Category.php b/classes/Category.php index 1258fc188..10b10a1f5 100644 --- a/classes/Category.php +++ b/classes/Category.php @@ -645,7 +645,8 @@ class CategoryCore extends ObjectModel LEFT JOIN `'._DB_PREFIX_.'manufacturer` m ON m.`id_manufacturer` = p.`id_manufacturer` 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 .($active ? ' AND product_shop.`active` = 1' : '') .($front ? ' AND product_shop.`visibility` IN ("both", "catalog")' : '') diff --git a/classes/Product.php b/classes/Product.php index 62414eb9f..c2b2a424a 100644 --- a/classes/Product.php +++ b/classes/Product.php @@ -2484,7 +2484,7 @@ class ProductCore extends ObjectModel $sql->where('p.`id_product` = '.(int)$id_product); 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->join(Shop::addSqlAssociation('product_attribute', 'pa', false, 'product_attribute_shop.id_shop = p.id_shop_default')); }