AC-10269: Gift registry frontend enhancements

faraz-gl · faraz-gl · commit 1d19aa4b283b · 2024-02-05T22:26:13.000+05:30
* Code refinements
diff --git a/lib/internal/Magento/Framework/Mail/EmailMessage.php b/lib/internal/Magento/Framework/Mail/EmailMessage.php
@@ -276,9 +276,9 @@ private function convertAddressArrayToAddressList(array $arrayList): AddressList
      */
     private function sanitiseEmail(?string $email): ?string
     {
-        if (!empty($email) && str_contains($email, '=?')) {
-            $decodedValue = trim(iconv_mime_decode($email, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, 'UTF-8'));
-            if ($this->isEncoded(trim($email), $decodedValue)) {
+        if (!empty($email) && str_starts_with($email, '=?')) {
+            $decodedValue = iconv_mime_decode($email, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, 'UTF-8');
+            if ($this->isEncoded($email, $decodedValue)) {
                 $email = strtolower(str_replace('=22', '', $email));
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -276,9 +276,9 @@ private function convertAddressArrayToAddressList(array $arrayList): AddressList`
`276`	`276`	`*/`
`277`	`277`	`private function sanitiseEmail(?string $email): ?string`
`278`	`278`	`{`
`279`		`- if (!empty($email) && str_contains($email, '=?')) {`
`280`		`- $decodedValue = trim(iconv_mime_decode($email, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, 'UTF-8'));`
`281`		`- if ($this->isEncoded(trim($email), $decodedValue)) {`
	`279`	`+ if (!empty($email) && str_starts_with($email, '=?')) {`
	`280`	`+ $decodedValue = iconv_mime_decode($email, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, 'UTF-8');`
	`281`	`+ if ($this->isEncoded($email, $decodedValue)) {`
`282`	`282`	`$email = strtolower(str_replace('=22', '', $email));`
`283`	`283`	`}`
`284`	`284`	`}`