Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

2012-12-03 14:14:54 +01:00
parent ed3e0e1a58 428c1fa99b
commit 13ebd3afef
5 changed files with 19 additions and 8 deletions
@@ -806,7 +806,7 @@ class ProductCore extends ObjectModel
 			SELECT c.`id_category`
 			FROM `'._DB_PREFIX_.'category_product` cp
 			LEFT JOIN `'._DB_PREFIX_.'category` c ON (c.`id_category` = cp.`id_category`)
-			'.Shop::addSqlAssociation('category', 'c', true).'
+			'.Shop::addSqlAssociation('category', 'c', true, null, true).'
 			WHERE cp.`id_category` NOT IN ('.implode(',', array_map('intval', $categories)).')
 			AND cp.id_product = '.$this->id
 		);