dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] Classes : #PSCFI-4973 : Bug fix mail receiver was null

Browse Source
This commit is contained in:
Francois Gaillard
2012-05-10 15:02:19 +00:00
parent b08e6d09e1
commit 7aa0ed4593
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Mail.php
+4 -1
View File
@@ -133,6 +133,8 @@ class MailCore
if ($toName && is_array($toName) && Validate::isGenericName($toName[$key])) if ($toName && is_array($toName) && Validate::isGenericName($toName[$key]))
$to_name = $toName[$key]; $to_name = $toName[$key];
} }
if ($to_name == null)
$to_name = $addr;
/* Encode accentuated chars */ /* Encode accentuated chars */
$to_list->addTo($addr, '=?UTF-8?B?'.base64_encode($to_name).'?='); $to_list->addTo($addr, '=?UTF-8?B?'.base64_encode($to_name).'?=');
} }
@@ -141,6 +143,8 @@ class MailCore
} else { } else {
/* Simple recipient, one address */ /* Simple recipient, one address */
$to_plugin = $to; $to_plugin = $to;
if ($toName == null)
$toName = $to;
$to = new Swift_Address($to, '=?UTF-8?B?'.base64_encode($toName).'?='); $to = new Swift_Address($to, '=?UTF-8?B?'.base64_encode($toName).'?=');
} }
try { try {
@@ -230,7 +234,6 @@ class MailCore
if (isset($attachment['content']) && isset($attachment['name']) && isset($attachment['mime'])) if (isset($attachment['content']) && isset($attachment['name']) && isset($attachment['mime']))
$message->attach(new Swift_Message_Attachment($attachment['content'], $attachment['name'], $attachment['mime'])); $message->attach(new Swift_Message_Attachment($attachment['content'], $attachment['name'], $attachment['mime']));
} }
/* Send mail */ /* Send mail */
$send = $swift->send($message, $to, new Swift_Address($from, $fromName)); $send = $swift->send($message, $to, new Swift_Address($from, $fromName));
$swift->disconnect(); $swift->disconnect();