Message: slashes in "display-name" are stripped

see https://tools.ietf.org/html/rfc2822
nette · Jul 1, 2019 · 82fb366 · 82fb366
1 parent d1e952f
commit 82fb366
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/Mail/Message.php b/src/Mail/Message.php
@@ -143,9 +143,10 @@ private function formatEmail(string $email, string $name = null): array
 	{
 		if (!$name && preg_match('#^(.+) +<(.*)>\z#', $email, $matches)) {
 			[, $name, $email] = $matches;
+			$name = stripslashes($name);
 			$tmp = substr($name, 1, -1);
 			if ($name === '"' . $tmp . '"') {
-				$name = stripslashes($tmp);
+				$name = $tmp;
 			}
 		}
 		return [$email => $name];

diff --git a/tests/Mail/Mail.email.parse.phpt b/tests/Mail/Mail.email.parse.phpt
@@ -34,7 +34,7 @@ $mail->setFrom('"Žluťouč\"k\ý kůň" <[email protected]>');
 Assert::same(['[email protected]' => 'Žluťouč"ký kůň'], $mail->getFrom());
 
 $mail->setFrom('The\Mail <[email protected]>');
-Assert::same(['[email protected]' => 'The\Mail'], $mail->getFrom());
+Assert::same(['[email protected]' => 'TheMail'], $mail->getFrom());
 
 $mail->setFrom('The.Mail <[email protected]>');
 Assert::same(['[email protected]' => 'The.Mail'], $mail->getFrom());
diff --git a/tests/Mail/Mail.email.phpt b/tests/Mail/Mail.email.phpt
@@ -46,7 +46,7 @@ Reply-To: =?UTF-8?B?xb1sdcWlb3XEjWvDvSBrxa/FiA==?= <[email protected]>,
 	John Doe <[email protected]>
 To: =?UTF-8?B?xb1sdcWlb3XEjWvDvSAia8WvxYgi?= <[email protected]>,
 	John 'jd' Doe <[email protected]>
-Cc: "The\\Mail" <[email protected]>,John Doe <[email protected]>,"The.Mail"
+Cc: TheMail <[email protected]>,John Doe <[email protected]>,"The.Mail"
 	 <[email protected]>
 Bcc: =?UTF-8?B?xb1sdcWlb3XEjWvDvSBrxa/FiA==?= <[email protected]>,
 	[email protected]