Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ bug #1341 ] Lastname not added by file or direct input in mass e-mailing #1563

Merged
merged 2 commits into from
May 4, 2014
Merged

[ bug #1341 ] Lastname not added by file or direct input in mass e-mailing #1563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4126fa
[ bug #1341 ] Lastname not added by file or direct input in mass
May 1, 2014
2637305
same
May 1, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Fix: Error on field accountancy code for export profile of invoices.
Fix: [ bug #1351 ] VIES verification link broken.
Fix: [ bug #1352 ] Removing a shipping does not remove the delivery.
Fix: Option MAIN_INVERT_SENDER_RECIPIENT broken with typhon template.
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 *****
Expand Down
2 changes: 1 addition & 1 deletion htdocs/core/modules/mailings/modules_mailings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ function add_to_target($mailing_id, $cibles)
$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)
Expand Down
2 changes: 1 addition & 1 deletion htdocs/core/modules/mailings/xinputfile.modules.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ function add_to_target($mailing_id,$filtersarray=array())
{
$cibles[$j] = array(
'email' => $email,
'name' => $name,
'lastname' => $name,
'firstname' => $firstname,
'other' => $other,
'source_url' => '',
Expand Down
2 changes: 1 addition & 1 deletion htdocs/core/modules/mailings/xinputuser.modules.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ function add_to_target($mailing_id,$filtersarray=array())
{
$cibles[] = array(
'email' => $email,
'name' => $lastname,
'lastname' => $lastname,
'firstname' => $firstname,
'other' => $other,
'source_url' => '',
Expand Down