mirror
/
PHPMailer
mirror of https://github.com/PHPMailer/PHPMailer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 6634c4b058 into 0962b82b77

This commit is contained in:
William Barath 2013-11-25 17:34:19 -08:00
parent 0962b82b77 6634c4b058
commit fdab71a7cf
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
class.phpmailer.php
View File

@ -757,6 +757,10 @@ class PHPMailer
*/
protected function addAnAddress($kind, $address, $name = '')
{
if (count($parts=preg_split('/[<[]/',$address))==2){ // handle 'fancy' address
$address=trim(substr($parts[1],0,-1),']>');
$name=trim($parts[0]);
}
if (!preg_match('/^(to|cc|bcc|Reply-To)$/', $kind)) {
$this->setError($this->lang('Invalid recipient array') . ': ' . $kind);
if ($this->exceptions) {
@ -800,6 +804,10 @@ class PHPMailer
*/
public function setFrom($address, $name = '', $auto = true)
{
if (count($parts=preg_split('/[<[]/',$address))==2){ // handle 'fancy' address
$address=trim(substr($parts[1],0,-1),']>');
$name=trim($parts[0]);
}
$address = trim($address);
$name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
if (!$this->validateAddress($address)) {