MC-41497: [Contact us] Invalid header value detected error when French characters such as "é", "è" on the email address

victor-v-rad · victor-v-rad · commit 4eb859491b0d · 2021-04-13T15:21:06.000-05:00
diff --git a/lib/internal/Magento/Framework/Mail/AddressConverter.php b/lib/internal/Magento/Framework/Mail/AddressConverter.php
@@ -60,7 +60,7 @@ private function convertEmailUserToAscii(string $email): string
         if (preg_match('/^(.+)@([^@]+)$/', $email, $matches)) {
             $user = $matches[1];
             $hostname = $matches[2];
-            $userEncoded = idn_to_ascii($user);
+            $userEncoded = idn_to_ascii($user, IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46);
             if ($userEncoded == $user) {
                 return $email;
             }

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ private function convertEmailUserToAscii(string $email): string`
`60`	`60`	`if (preg_match('/^(.+)@([^@]+)$/', $email, $matches)) {`
`61`	`61`	`$user = $matches[1];`
`62`	`62`	`$hostname = $matches[2];`
`63`		`- $userEncoded = idn_to_ascii($user);`
	`63`	`+ $userEncoded = idn_to_ascii($user, IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46);`
`64`	`64`	`if ($userEncoded == $user) {`
`65`	`65`	`return $email;`
`66`	`66`	`}`