diff --git a/wp-includes/PHPMailer/PHPMailer.php b/wp-includes/PHPMailer/PHPMailer.php index 865f3a4e14..0a8711f489 100644 --- a/wp-includes/PHPMailer/PHPMailer.php +++ b/wp-includes/PHPMailer/PHPMailer.php @@ -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 diff --git a/wp-includes/PHPMailer/POP3.php b/wp-includes/PHPMailer/POP3.php index d45b4ad78d..2c2cf78938 100644 --- a/wp-includes/PHPMailer/POP3.php +++ b/wp-includes/PHPMailer/POP3.php @@ -46,7 +46,7 @@ class POP3 * * @var string */ - const VERSION = '6.11.0'; + const VERSION = '6.11.1'; /** * Default POP3 port number. diff --git a/wp-includes/PHPMailer/SMTP.php b/wp-includes/PHPMailer/SMTP.php index c448a0aea9..3772c94ad7 100644 --- a/wp-includes/PHPMailer/SMTP.php +++ b/wp-includes/PHPMailer/SMTP.php @@ -35,7 +35,7 @@ class SMTP * * @var string */ - const VERSION = '6.11.0'; + const VERSION = '6.11.1'; /** * SMTP line break constant. diff --git a/wp-includes/class-wp-phpmailer.php b/wp-includes/class-wp-phpmailer.php index 24d59c113c..34747d295d 100644 --- a/wp-includes/class-wp-phpmailer.php +++ b/wp-includes/class-wp-phpmailer.php @@ -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; diff --git a/wp-includes/version.php b/wp-includes/version.php index 82fbd8245b..e378791561 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -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.