Changeset 52252 for trunk/src/wp-includes/PHPMailer/PHPMailer.php
- Timestamp:
- 11/26/2021 12:41:54 AM (3 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-includes/PHPMailer/PHPMailer.php
r51635 r52252 751 751 * @var string 752 752 */ 753 const VERSION = '6.5. 1';753 const VERSION = '6.5.3'; 754 754 755 755 /** … … 1452 1452 if (defined('INTL_IDNA_VARIANT_UTS46')) { 1453 1453 //Use the current punycode standard (appeared in PHP 7.2) 1454 $punycode = idn_to_ascii($domain, $errorcode, \INTL_IDNA_VARIANT_UTS46); 1454 $punycode = idn_to_ascii( 1455 $domain, 1456 \IDNA_DEFAULT | \IDNA_USE_STD3_RULES | \IDNA_CHECK_BIDI | 1457 \IDNA_CHECK_CONTEXTJ | \IDNA_NONTRANSITIONAL_TO_ASCII, 1458 \INTL_IDNA_VARIANT_UTS46 1459 ); 1455 1460 } elseif (defined('INTL_IDNA_VARIANT_2003')) { 1456 1461 //Fall back to this old, deprecated/removed encoding … … 1700 1705 //Qmail docs: http://www.qmail.org/man/man8/qmail-inject.html 1701 1706 //Example problem: https://www.drupal.org/node/1057954 1702 if (empty($this->Sender) && !empty(ini_get('sendmail_from'))) { 1707 1708 //PHP 5.6 workaround 1709 $sendmail_from_value = ini_get('sendmail_from'); 1710 if (empty($this->Sender) && !empty($sendmail_from_value)) { 1703 1711 //PHP config has a sender address we can use 1704 1712 $this->Sender = ini_get('sendmail_from'); … … 1882 1890 //Example problem: https://www.drupal.org/node/1057954 1883 1891 //CVE-2016-10033, CVE-2016-10045: Don't pass -f if characters will be escaped. 1884 if (empty($this->Sender) && !empty(ini_get('sendmail_from'))) { 1892 1893 //PHP 5.6 workaround 1894 $sendmail_from_value = ini_get('sendmail_from'); 1895 if (empty($this->Sender) && !empty($sendmail_from_value)) { 1885 1896 //PHP config has a sender address we can use 1886 1897 $this->Sender = ini_get('sendmail_from'); … … 2199 2210 * Optionally, the language code can be enhanced with a 4-character 2200 2211 * script annotation and/or a 2-character country annotation. 2201 * @param string $lang_path Path to the language file directory, with trailing separator (slash) .D2212 * @param string $lang_path Path to the language file directory, with trailing separator (slash) 2202 2213 * Do not set this from user input! 2203 2214 *
Note: See TracChangeset
for help on using the changeset viewer.