Changeset 48033 for trunk/src/wp-includes/pluggable.php

Timestamp:

06/12/2020 03:45:30 PM (5 years ago)

Author:

desrosj

Message:

External Libraries: Upgrade PHPMailer to version 6.1.6.

Now that WordPress Core supports PHP >= 5.6, the PHPMailer library can be updated to the latest version.

The PHPMailer files now reside in a new directory, wp-includes/PHPMailer. These files are copied verbatim from the library upstream and will make updating in the future easier. For backwards compatibility, the old files will remain and trigger deprecated file warnings.

The PHPMailer class is also now under the PHPMailer\PHPMailer\PHPMailer namespace. The PHPMailer class in the global namespace has been aliased for a seamless transition.

This upgrade also clears up a handful of PHP compatibility issues detailed in #49922.

For a full list of changes, see the PHPMailer GitHub: ​https://github.com/PHPMailer/PHPMailer/compare/v5.2.27...v6.1.6.

Props Synchro, SergeyBiryukov, desrosj, donmhico, ayeshrajans.
Fixes #41750.

File:

• trunk/src/wp-includes/pluggable.php (modified) (8 diffs)

trunk/src/wp-includes/pluggable.php

@@ -159 +159 @@
      * @since 1.2.1
      *
-     * @global PHPMailer $phpmailer
+     * @global PHPMailer\PHPMailer\PHPMailer $phpmailer
      *
      * @param string|array $to          Array or comma-separated list of email addresses to send message.
@@ -211 +211 @@
 
         // (Re)create it, if it's gone missing.
-        if ( ! ( $phpmailer instanceof PHPMailer ) ) {
-            require_once ABSPATH . WPINC . '/class-phpmailer.php';
-            require_once ABSPATH . WPINC . '/class-smtp.php';
-            $phpmailer = new PHPMailer( true );
+        if ( ! ( $phpmailer instanceof PHPMailer\PHPMailer\PHPMailer ) ) {
+            require_once ABSPATH . WPINC . '/PHPMailer/PHPMailer.php';
+            require_once ABSPATH . WPINC . '/PHPMailer/SMTP.php';
+            require_once ABSPATH . WPINC . '/PHPMailer/Exception.php';
+            $phpmailer = new PHPMailer\PHPMailer\PHPMailer( true );
         }
 
@@ -357 +358 @@
         try {
             $phpmailer->setFrom( $from_email, $from_name, false );
-        } catch ( phpmailerException $e ) {
+        } catch ( PHPMailer\PHPMailer\Exception $e ) {
             $mail_error_data                             = compact( 'to', 'subject', 'message', 'headers', 'attachments' );
             $mail_error_data['phpmailer_exception_code'] = $e->getCode();
@@ -405 +406 @@
                             break;
                     }
-                } catch ( phpmailerException $e ) {
+                } catch ( PHPMailer\PHPMailer\Exception $e ) {
                     continue;
                 }
@@ -456 +457 @@
                 // Only add custom headers not added automatically by PHPMailer.
                 if ( ! in_array( $name, array( 'MIME-Version', 'X-Mailer' ), true ) ) {
-                    $phpmailer->addCustomHeader( sprintf( '%1$s: %2$s', $name, $content ) );
+                    try {
+                        $phpmailer->addCustomHeader( sprintf( '%1$s: %2$s', $name, $content ) );
+                    } catch ( PHPMailer\PHPMailer\Exception $e ) {
+                        continue;
+                    }
                 }
             }
 
             if ( false !== stripos( $content_type, 'multipart' ) && ! empty( $boundary ) ) {
-                $phpmailer->addCustomHeader( sprintf( "Content-Type: %s;\n\t boundary=\"%s\"", $content_type, $boundary ) );
+                $phpmailer->addCustomHeader( sprintf( 'Content-Type: %s; boundary="%s"', $content_type, $boundary ) );
             }
         }
@@ -469 +474 @@
                 try {
                     $phpmailer->addAttachment( $attachment );
-                } catch ( phpmailerException $e ) {
+                } catch ( PHPMailer\PHPMailer\Exception $e ) {
                     continue;
                 }
@@ -487 +492 @@
         try {
             return $phpmailer->send();
-        } catch ( phpmailerException $e ) {
+        } catch ( PHPMailer\PHPMailer\Exception $e ) {
 
             $mail_error_data                             = compact( 'to', 'subject', 'message', 'headers', 'attachments' );
@@ -493 +498 @@
 
             /**
-             * Fires after a phpmailerException is caught.
+             * Fires after a PHPMailer\PHPMailer\Exception is caught.
              *
              * @since 4.4.0
              *
-             * @param WP_Error $error A WP_Error object with the phpmailerException message, and an array
+             * @param WP_Error $error A WP_Error object with the PHPMailer\PHPMailer\Exception message, and an array
              *                        containing the mail recipient, subject, message, headers, and attachments.
              */