HostForge-Systems/wordpress
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

External Libraries: Upgrade PHPMailer to version 6.11.1.

Browse Source 
This is a maintenance release with minor bug fixes.

References:
* [https://github.com/PHPMailer/PHPMailer/releases/tag/v6.11.1 PHPMailer 6.11.1 release notes]
* [https://github.com/PHPMailer/PHPMailer/compare/v6.11.0...v6.11.1 Full list of changes in PHPMailer 6.11.1]

Follow-up to [54937], [55557], [56484], [57137], [59246], [59481], [60623], [60813].

Props SirLouen, jrf, mukesh27, SergeyBiryukov.
Fixes #64055.
Built from https://develop.svn.wordpress.org/trunk@60888


git-svn-id: http://core.svn.wordpress.org/trunk@60224 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov
2025-10-01 13:23:28 +00:00
parent b271950c27
commit 111994ee81
5 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
wp-includes/PHPMailer/PHPMailer.php
View File

@@ -768,7 +768,7 @@ class PHPMailer
*
* @var string
*/
const VERSION = '6.11.0';
const VERSION = '6.11.1';
/**
* Error severity: message only, continue processing.
@@ -1241,15 +1241,15 @@ class PHPMailer
*
* @see https://www.andrew.cmu.edu/user/agreen1/testing/mrbs/web/Mail/RFC822.php A more careful implementation
*
* @param string $addrstr The address list string
* @param string|null $deprecatedArg Deprecated argument since 6.11.0.
* @param string $charset The charset to use when decoding the address list string.
* @param string $addrstr The address list string
* @param null $useimap Deprecated argument since 6.11.0.
* @param string $charset The charset to use when decoding the address list string.
*
* @return array
*/
public static function parseAddresses($addrstr, $deprecatedArg = null, $charset = self::CHARSET_ISO88591)
public static function parseAddresses($addrstr, $useimap = null, $charset = self::CHARSET_ISO88591)
{
if ($deprecatedArg !== null) {
if ($useimap !== null) {
trigger_error(self::lang('deprecated_argument'), E_USER_DEPRECATED);
}
$addresses = [];
@@ -2482,7 +2482,7 @@ class PHPMailer
'no_smtputf8' => 'Server does not support SMTPUTF8 needed to send to Unicode addresses',
'imap_recommended' => 'Using simplified address parser is not recommended. ' .
'Install the PHP IMAP extension for full RFC822 parsing.',
'deprecated_argument' => 'Argument $deprecatedArg is deprecated',
'deprecated_argument' => 'Argument $useimap is deprecated',
];
if (empty($lang_path)) {
//Calculate an absolute path so it can work if CWD is not here

2
wp-includes/PHPMailer/POP3.php
View File

@@ -46,7 +46,7 @@ class POP3
*
* @var string
*/
const VERSION = '6.11.0';
const VERSION = '6.11.1';
/**
* Default POP3 port number.

2
wp-includes/PHPMailer/SMTP.php
View File

@@ -35,7 +35,7 @@ class SMTP
*
* @var string
*/
const VERSION = '6.11.0';
const VERSION = '6.11.1';
/**
* SMTP line break constant.

11
wp-includes/class-wp-phpmailer.php
View File

@@ -41,9 +41,7 @@ class WP_PHPMailer extends PHPMailer\PHPMailer\PHPMailer {
'authenticate' => __( 'SMTP Error: Could not authenticate.' ),
'buggy_php' => sprintf(
/* translators: 1: mail.add_x_header. 2: php.ini */
__(
'Your version of PHP is affected by a bug that may result in corrupted messages. To fix it, switch to sending using SMTP, disable the %1$s option in your %2$s, or switch to MacOS or Linux, or upgrade your PHP version.'
),
__( 'Your version of PHP is affected by a bug that may result in corrupted messages. To fix it, switch to sending using SMTP, disable the %1$s option in your %2$s, or switch to MacOS or Linux, or upgrade your PHP version.' ),
'mail.add_x_header',
'php.ini'
),
@@ -90,11 +88,8 @@ class WP_PHPMailer extends PHPMailer\PHPMailer\PHPMailer {
'variable_set' => __( 'Cannot set or reset variable: ' ),
'no_smtputf8' => __( 'Server does not support SMTPUTF8 needed to send to Unicode addresses' ),
'imap_recommended' => __( 'Using simplified address parser is not recommended. Install the PHP IMAP extension for full RFC822 parsing.' ),
'deprecated_argument' => sprintf(
/* translators: %s: $deprecatedArg */
__( 'Argument %s is deprecated' ),
'$deprecatedArg'
),
/* translators: %s: $useimap */
'deprecated_argument' => sprintf( __( 'Argument %s is deprecated' ), '$useimap' ),
);
return true;

2
wp-includes/version.php
View File

@@ -16,7 +16,7 @@
*
* @global string $wp_version
*/
$wp_version = '6.9-alpha-60887';
$wp_version = '6.9-alpha-60888';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.