Merge branch 'FHenry-3.5' into 3.5

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.

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)

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' => '',

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' => '',