From e8b2ebd2462343485679b0a5f91af43e9f0d562d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 24 Mar 2011 00:05:07 +0000 Subject: [PATCH] Fix: If no filter is provided, no filter must be applied. --- htdocs/includes/modules/mailings/contacts2.modules.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/includes/modules/mailings/contacts2.modules.php b/htdocs/includes/modules/mailings/contacts2.modules.php index 95492a394c4..ed2117c233b 100755 --- a/htdocs/includes/modules/mailings/contacts2.modules.php +++ b/htdocs/includes/modules/mailings/contacts2.modules.php @@ -78,7 +78,7 @@ class mailing_contacts2 extends MailingTargets $sql.= " ".MAIN_DB_PREFIX."societe as s"; $sql.= " WHERE s.rowid = sp.fk_soc"; $sql.= " AND sp.email != ''"; // Note that null != '' is false - $sql.= " AND sp.poste != ''"; + //$sql.= " AND sp.poste != ''"; $sql.= " AND sp.entity = ".$conf->entity; if ($filtersarray[0]<>'all') $sql.= " AND sp.poste ='".$filtersarray[0]."'"; $sql.= " ORDER BY sp.name, sp.firstname"; @@ -155,7 +155,7 @@ class mailing_contacts2 extends MailingTargets $sql.= " AND s.entity = ".$conf->entity; $sql.= " AND sp.entity = ".$conf->entity; $sql.= " AND sp.email != ''"; // Note that null != '' is false - $sql.= " AND sp.poste != ''"; + //$sql.= " AND sp.poste != ''"; // La requete doit retourner un champ "nb" pour etre comprise // par parent::getNbOfRecipients return parent::getNbOfRecipients($sql);