[-] BO : BugFix : #PSCFV-2308 : Missing WHERE clause in Manufacturer::getManufacturers()

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15244 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-14 07:46:46 +00:00
parent b8587fab0f
commit 20f0360c27
1 changed files with 5 additions and 2 deletions
@@ -182,8 +182,11 @@ class ManufacturerCore extends ObjectModel
 				m.`id_manufacturer` = ml.`id_manufacturer`
 				AND ml.`id_lang` = '.(int)$id_lang.'
 			)
-			'.Shop::addSqlAssociation('manufacturer', 'm').
-			($active ? ' AND m.`active` = 1' : '').'
+			'.Shop::addSqlAssociation('manufacturer', 'm');
+			if ($active)
+				$sql .= '
+			WHERE m.`active` = 1';
+			$sql .= '
 			GROUP BY m.id_manufacturer
 			ORDER BY m.`name` ASC'.
 			($p ? ' LIMIT '.(((int)$p - 1) * (int)$n).','.(int)$n : '');