From c082d71b4e15982848ac7f2ba4f005454592ac30 Mon Sep 17 00:00:00 2001
From: vChabot <vincent.chabot@prestashop.com>
Date: Mon, 14 May 2012 07:46:46 +0000
Subject: [PATCH] [-] BO : BugFix : #PSCFV-2308 : Missing WHERE clause in
 Manufacturer::getManufacturers()

---
 classes/Manufacturer.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/classes/Manufacturer.php b/classes/Manufacturer.php
index 0548a0b3c..7a4560996 100644
--- a/classes/Manufacturer.php
+++ b/classes/Manufacturer.php
@@ -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 : '');