From 8b77d82ca946c3d191c13b0b053162f16042d9d9 Mon Sep 17 00:00:00 2001 From: dMetzger Date: Fri, 31 Aug 2012 15:51:56 +0000 Subject: [PATCH] // Opti git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17139 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/Product.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/classes/Product.php b/classes/Product.php index 61b4eeb1d..d3bd2a01d 100644 --- a/classes/Product.php +++ b/classes/Product.php @@ -1855,7 +1855,6 @@ class ProductCore extends ObjectModel ); $sql->leftJoin('tax', 't', 't.`id_tax` = tr.`id_tax`'); $sql->leftJoin('manufacturer', 'm', 'm.`id_manufacturer` = p.`id_manufacturer`'); - $sql->join(Product::sqlStock('p', 0)); $sql->where('product_shop.`active` = 1'); if ($front) @@ -1885,7 +1884,9 @@ class ProductCore extends ObjectModel $sql->select('pa.id_product_attribute'); $sql->leftOuterJoin('product_attribute', 'pa', 'p.`id_product` = pa.`id_product`'); $sql->join(Shop::addSqlAssociation('product_attribute', 'pa', false, 'product_attribute_shop.default_on = 1')); + $sql->where('(pa.id_product_attribute IS NULL OR product_attribute_shop.id_product_attribute IS NOT NULL)'); } + $sql->join(Product::sqlStock('p', Combination::isFeatureActive() ? 'product_attribute_shop' : 0)); $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql);