mirror
/
PHPMailer
mirror of https://github.com/PHPMailer/PHPMailer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Unicode is a proper name

This commit is contained in:
Marcus Bointon 2024-10-14 22:12:29 +02:00
parent 37e54ed3ed
commit c1c3b24e9c
No known key found for this signature in database
GPG Key ID: DE31CD6EB646AA24
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/contentsutf8.html
View File

@ -10,7 +10,7 @@
<div align="center"> <div align="center">
<a href="https://github.com/PHPMailer/PHPMailer/"><img src="images/phpmailer.png" height="90" width="340" alt="PHPMailer rocks"></a> <a href="https://github.com/PHPMailer/PHPMailer/"><img src="images/phpmailer.png" height="90" width="340" alt="PHPMailer rocks"></a>
</div> </div>
<p>This example uses <strong>HTML</strong> with the UTF-8 unicode charset.</p> <p>This example uses <strong>HTML</strong> with the UTF-8 Unicode charset.</p>
<p>Chinese text: 郵件內容為空</p> <p>Chinese text: 郵件內容為空</p>
<p>Russian text: Пустое тело сообщения</p> <p>Russian text: Пустое тело сообщения</p>
<p>Armenian text: Հաղորդագրությունը դատարկ է</p> <p>Armenian text: Հաղորդագրությունը դատարկ է</p>

8
src/PHPMailer.php
View File

@ -1588,10 +1588,10 @@ class PHPMailer
$this->error_count = 0; //Reset errors $this->error_count = 0; //Reset errors
$this->mailHeader = ''; $this->mailHeader = '';
//The code below tries to support full use of unicode, //The code below tries to support full use of Unicode,
//while remaining compatible with legacy SMTP servers to //while remaining compatible with legacy SMTP servers to
//the greatest degree possible: If the message uses //the greatest degree possible: If the message uses
//unicode in the localparts of any addresses, it is sent //Unicode in the localparts of any addresses, it is sent
//using SMTPUTF8. If not, it it sent using //using SMTPUTF8. If not, it it sent using
//pynycode-encoded domains and plain SMTP. //pynycode-encoded domains and plain SMTP.
if ( if (
@ -4309,7 +4309,7 @@ class PHPMailer
} }
/** /**
* Check whether the supplied address uses unicode in the localpart. * Check whether the supplied address uses Unicode in the localpart.
* *
* @return bool * @return bool
*/ */
@ -4319,7 +4319,7 @@ class PHPMailer
} }
/** /**
* Check whether any of the supplied addresses use unicode in the * Check whether any of the supplied addresses use Unicode in the
* localpart. * localpart.
* *
* @return bool * @return bool

2
test/PHPMailer/PHPMailerTest.php
View File

@ -1225,7 +1225,7 @@ EOT;
self::assertTrue($this->Mail->UseSMTPUTF8); self::assertTrue($this->Mail->UseSMTPUTF8);
//If using SMTPUTF8, then the To header should contain //If using SMTPUTF8, then the To header should contain
//unicode@unicode, for better rendering by clients like Mac //Unicode@Unicode, for better rendering by clients like Mac
//Outlook. //Outlook.
$this->Mail->addAddress('spın̈altap@spın̈altap.invalid', ''); $this->Mail->addAddress('spın̈altap@spın̈altap.invalid', '');
$this->Mail->preSend(); $this->Mail->preSend();

2
test/PHPMailer/ValidateAddressTest.php
View File

@ -438,7 +438,7 @@ final class ValidateAddressTest extends TestCase
'first.last@phplíst.com', 'first.last@phplíst.com',
]; ];
return $this->arrayToNamedDataProvider($unicodeaddresses, 'Invalid unicode: '); return $this->arrayToNamedDataProvider($unicodeaddresses, 'Invalid Unicode: ');
} }
/** /**