Changeset 60888

Timestamp:

10/01/2025 01:21:33 PM (6 weeks ago)

Author:

SergeyBiryukov

Message:

External Libraries: Upgrade PHPMailer to version 6.11.1.

This is a maintenance release with minor bug fixes.

References:

• ​PHPMailer 6.11.1 release notes
• ​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.

Location:

trunk/src/wp-includes

Files:

• PHPMailer/PHPMailer.php (modified) (3 diffs)
• PHPMailer/POP3.php (modified) (1 diff)
• PHPMailer/SMTP.php (modified) (1 diff)
• class-wp-phpmailer.php (modified) (2 diffs)

trunk/src/wp-includes/PHPMailer/PHPMailer.php

@@ -769 +769 @@
      * @var string
      */
-    const VERSION = '6.11.0';
+    const VERSION = '6.11.1';
 
     /**
@@ -1242 +1242 @@
      * @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)
-    {
-        if ($deprecatedArg !== null) {
+    public static function parseAddresses($addrstr, $useimap = null, $charset = self::CHARSET_ISO88591)
+    {
+        if ($useimap !== null) {
             trigger_error(self::lang('deprecated_argument'), E_USER_DEPRECATED);
         }
@@ -2483 +2483 @@
             '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)) {

trunk/src/wp-includes/PHPMailer/POP3.php

@@ -47 +47 @@
      * @var string
      */
-    const VERSION = '6.11.0';
+    const VERSION = '6.11.1';
 
     /**

trunk/src/wp-includes/PHPMailer/SMTP.php

@@ -36 +36 @@
      * @var string
      */
-    const VERSION = '6.11.0';
+    const VERSION = '6.11.1';
 
     /**

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

@@ -42 +42 @@
             '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'
@@ -91 +89 @@
             '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' ),
         );