lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '3.5' of github.com:FHenry/dolibarr into FHenry-3.5

Browse Source 
Conflicts:
	ChangeLog
This commit is contained in:
Laurent Destailleur 2014-05-04 17:43:47 +02:00
commit 697f68c9a9
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -11,6 +11,7 @@ Fix: Can disable features with PHPEXCEL (no DLSF compatible).
Fix: Can disable features with CKEDITOR. Fix: Can disable features with CKEDITOR.
Fix: Pb of records not correctly cleaned when module marge is Fix: Pb of records not correctly cleaned when module marge is
uninstalled (conflict between 'margin' and 'margins'). 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 ***** ***** ChangeLog for 3.5.2 compared to 3.5.1 *****
Fix: Can't add user for a task. Fix: Can't add user for a task.

2
htdocs/core/modules/mailings/modules_mailings.php
View File

@ -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['other'])."',";
$sql.= "'".$this->db->escape($targetarray['source_url'])."',"; $sql.= "'".$this->db->escape($targetarray['source_url'])."',";
$sql.= (empty($targetarray['source_id']) ? 'null' : "'".$this->db->escape($targetarray['source_id'])."'").","; $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'])."')"; $sql .= "'".$this->db->escape($targetarray['source_type'])."')";
$result=$this->db->query($sql); $result=$this->db->query($sql);
if ($result) if ($result)

2
htdocs/core/modules/mailings/xinputfile.modules.php
View File

@ -166,7 +166,7 @@ class mailing_xinputfile extends MailingTargets
{ {
$cibles[$j] = array( $cibles[$j] = array(
'email' => $email, 'email' => $email,
'name' => $name, 'lastname' => $name,
'firstname' => $firstname, 'firstname' => $firstname,
'other' => $other, 'other' => $other,
'source_url' => '', 'source_url' => '',

2
htdocs/core/modules/mailings/xinputuser.modules.php
View File

@ -134,7 +134,7 @@ class mailing_xinputuser extends MailingTargets
{ {
$cibles[] = array( $cibles[] = array(
'email' => $email, 'email' => $email,
'name' => $lastname, 'lastname' => $lastname,
'firstname' => $firstname, 'firstname' => $firstname,
'other' => $other, 'other' => $other,
'source_url' => '', 'source_url' => '',