Skip to content
Permalink
Browse files

Move alias wrapping into _formatAddress()

Fixes #2502
  • Loading branch information...
markstory committed Feb 11, 2012
1 parent e1dba67 commit 0207a61e9ba357219740cdf716a75f17419572bf
Showing with 5 additions and 3 deletions.
  1. +3 −3 lib/Cake/Network/Email/CakeEmail.php
  2. +2 −0 lib/Cake/Test/Case/Network/Email/CakeEmailTest.php
@@ -686,6 +686,9 @@ protected function _formatAddress($address) {
if ($email === $alias) {
$return[] = $email;
} else {
if (strpos($alias, ',') !== false) {
$alias = '"' . $alias . '"';
}
$return[] = sprintf('%s <%s>', $this->_encode($alias), $email);
}
}
@@ -1109,9 +1112,6 @@ protected function _encode($text) {
$restore = mb_internal_encoding();
mb_internal_encoding($this->_appCharset);
}
if (strpos($text, ',') !== false) {
$text = '"' . $text . '"';
}
$return = mb_encode_mimeheader($text, $this->headerCharset, 'B');
if ($internalEncoding) {
mb_internal_encoding($restore);
@@ -395,6 +395,8 @@ public function testSubject() {
$this->CakeEmail->subject('You have a new message.');
$this->assertSame($this->CakeEmail->subject(), 'You have a new message.');
$this->CakeEmail->subject('You have a new message, I think.');
$this->assertSame($this->CakeEmail->subject(), 'You have a new message, I think.');
$this->CakeEmail->subject(1);
$this->assertSame($this->CakeEmail->subject(), '1');

0 comments on commit 0207a61

Please sign in to comment.
You can’t perform that action at this time.