diff --git a/ChangeLog b/ChangeLog index cb2b906ea275b8ea066daf1907d4f63a9778f3e1..3d0caa7d0fbf271fef4dc2500a5979eb5985bff8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ Fix: Can disable features with PHPEXCEL (no DLSF compatible). Fix: Can disable features with CKEDITOR. Fix: Pb of records not correctly cleaned when module marge is uninstalled (conflict between 'margin' and 'margins'). +Fix: [ bug #1341 ] Lastname not added by file or direct input in mass e-mailing ***** ChangeLog for 3.5.2 compared to 3.5.1 ***** Fix: Can't add user for a task. diff --git a/htdocs/core/modules/mailings/modules_mailings.php b/htdocs/core/modules/mailings/modules_mailings.php index 4f0599bfb3b49393c3b0d62b848ce342b64cc512..6f4a573ccfc291e4fa01888a72d68455ffb2d3f2 100644 --- a/htdocs/core/modules/mailings/modules_mailings.php +++ b/htdocs/core/modules/mailings/modules_mailings.php @@ -168,7 +168,7 @@ class MailingTargets // This can't be abstract as it is used for some method $sql.= "'".$this->db->escape($targetarray['other'])."',"; $sql.= "'".$this->db->escape($targetarray['source_url'])."',"; $sql.= (empty($targetarray['source_id']) ? 'null' : "'".$this->db->escape($targetarray['source_id'])."'").","; - $sql .= "'".$this->db->escape(dol_hash($targetarray['email'].';'.$targetarray['name'].';'.$mailing_id.';'.$conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY))."',"; + $sql .= "'".$this->db->escape(dol_hash($targetarray['email'].';'.$targetarray['lastname'].';'.$mailing_id.';'.$conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY))."',"; $sql .= "'".$this->db->escape($targetarray['source_type'])."')"; $result=$this->db->query($sql); if ($result) diff --git a/htdocs/core/modules/mailings/xinputfile.modules.php b/htdocs/core/modules/mailings/xinputfile.modules.php index f6f47db95bb79f400ed0ebf8bb7984ff201ea03d..40fd949fd0890f5300ec9ed887860fb6d82c0c3f 100644 --- a/htdocs/core/modules/mailings/xinputfile.modules.php +++ b/htdocs/core/modules/mailings/xinputfile.modules.php @@ -166,7 +166,7 @@ class mailing_xinputfile extends MailingTargets { $cibles[$j] = array( 'email' => $email, - 'name' => $name, + 'lastname' => $name, 'firstname' => $firstname, 'other' => $other, 'source_url' => '', diff --git a/htdocs/core/modules/mailings/xinputuser.modules.php b/htdocs/core/modules/mailings/xinputuser.modules.php index a1c60bf527c2dc854c904b1cc2831bde684bbd6d..c79054c63a7ae471fb810db4259c601842abaf59 100644 --- a/htdocs/core/modules/mailings/xinputuser.modules.php +++ b/htdocs/core/modules/mailings/xinputuser.modules.php @@ -134,7 +134,7 @@ class mailing_xinputuser extends MailingTargets { $cibles[] = array( 'email' => $email, - 'name' => $lastname, + 'lastname' => $lastname, 'firstname' => $firstname, 'other' => $other, 'source_url' => '',