Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Move alias wrapping into _formatAddress()

Fixes #2502
  • Loading branch information...
commit 0207a61e9ba357219740cdf716a75f17419572bf 1 parent e1dba67
@markstory markstory authored
View
6 lib/Cake/Network/Email/CakeEmail.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);
View
2  lib/Cake/Test/Case/Network/Email/CakeEmailTest.php
@@ -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');
Please sign in to comment.
Something went wrong with that request. Please try again.