Skip to content

Commit 68b6ddc

Browse files
External Libraries: Upgrade PHPMailer to version 6.11.1.
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] * [PHPMailer/PHPMailer@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. git-svn-id: https://develop.svn.wordpress.org/trunk@60888 602fd350-edb4-49c9-b593-d223f7449a82
1 parent 055010b commit 68b6ddc

File tree

4 files changed

+12
-17
lines changed

4 files changed

+12
-17
lines changed

src/wp-includes/PHPMailer/PHPMailer.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -768,7 +768,7 @@ class PHPMailer
768768
*
769769
* @var string
770770
*/
771-
const VERSION = '6.11.0';
771+
const VERSION = '6.11.1';
772772

773773
/**
774774
* Error severity: message only, continue processing.
@@ -1241,15 +1241,15 @@ protected function addAnAddress($kind, $address, $name = '')
12411241
*
12421242
* @see https://www.andrew.cmu.edu/user/agreen1/testing/mrbs/web/Mail/RFC822.php A more careful implementation
12431243
*
1244-
* @param string $addrstr The address list string
1245-
* @param string|null $deprecatedArg Deprecated argument since 6.11.0.
1246-
* @param string $charset The charset to use when decoding the address list string.
1244+
* @param string $addrstr The address list string
1245+
* @param null $useimap Deprecated argument since 6.11.0.
1246+
* @param string $charset The charset to use when decoding the address list string.
12471247
*
12481248
* @return array
12491249
*/
1250-
public static function parseAddresses($addrstr, $deprecatedArg = null, $charset = self::CHARSET_ISO88591)
1250+
public static function parseAddresses($addrstr, $useimap = null, $charset = self::CHARSET_ISO88591)
12511251
{
1252-
if ($deprecatedArg !== null) {
1252+
if ($useimap !== null) {
12531253
trigger_error(self::lang('deprecated_argument'), E_USER_DEPRECATED);
12541254
}
12551255
$addresses = [];
@@ -2482,7 +2482,7 @@ public static function setLanguage($langcode = 'en', $lang_path = '')
24822482
'no_smtputf8' => 'Server does not support SMTPUTF8 needed to send to Unicode addresses',
24832483
'imap_recommended' => 'Using simplified address parser is not recommended. ' .
24842484
'Install the PHP IMAP extension for full RFC822 parsing.',
2485-
'deprecated_argument' => 'Argument $deprecatedArg is deprecated',
2485+
'deprecated_argument' => 'Argument $useimap is deprecated',
24862486
];
24872487
if (empty($lang_path)) {
24882488
//Calculate an absolute path so it can work if CWD is not here

src/wp-includes/PHPMailer/POP3.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class POP3
4646
*
4747
* @var string
4848
*/
49-
const VERSION = '6.11.0';
49+
const VERSION = '6.11.1';
5050

5151
/**
5252
* Default POP3 port number.

src/wp-includes/PHPMailer/SMTP.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class SMTP
3535
*
3636
* @var string
3737
*/
38-
const VERSION = '6.11.0';
38+
const VERSION = '6.11.1';
3939

4040
/**
4141
* SMTP line break constant.

src/wp-includes/class-wp-phpmailer.php

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,7 @@ public static function setLanguage( $langcode = 'en', $lang_path = '' ) {
4141
'authenticate' => __( 'SMTP Error: Could not authenticate.' ),
4242
'buggy_php' => sprintf(
4343
/* translators: 1: mail.add_x_header. 2: php.ini */
44-
__(
45-
'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.'
46-
),
44+
__( '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.' ),
4745
'mail.add_x_header',
4846
'php.ini'
4947
),
@@ -90,11 +88,8 @@ public static function setLanguage( $langcode = 'en', $lang_path = '' ) {
9088
'variable_set' => __( 'Cannot set or reset variable: ' ),
9189
'no_smtputf8' => __( 'Server does not support SMTPUTF8 needed to send to Unicode addresses' ),
9290
'imap_recommended' => __( 'Using simplified address parser is not recommended. Install the PHP IMAP extension for full RFC822 parsing.' ),
93-
'deprecated_argument' => sprintf(
94-
/* translators: %s: $deprecatedArg */
95-
__( 'Argument %s is deprecated' ),
96-
'$deprecatedArg'
97-
),
91+
/* translators: %s: $useimap */
92+
'deprecated_argument' => sprintf( __( 'Argument %s is deprecated' ), '$useimap' ),
9893
);
9994

10095
return true;

0 commit comments

Comments
 (0)