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

Timestamp:

12/30/2016 06:43:07 AM (10 years ago)

Author:

dd32

Message:

Mail: Ensure that any phpmailerException exceptions generated by setFrom() are caught to avoid PHP Fatal errors.

This change avoids a PHP fatal error that can be encountered when the specified (or generated) source email is an invalid address, such as wordpress@_, it makes no effort to set a valid source, only avoid the fatal error.

See #25239 for correcting the email address.
Fixes #39360.

File:

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

trunk/src/wp-includes/pluggable.php

@@ -186 +186 @@
         if ( isset( $atts['to'] ) ) {
                 $to = $atts['to'];
+        }
+
+        if ( !is_array( $to ) ) {
+                $to = explode( ',', $to );
         }
 
@@ -350 +354 @@
         $from_name = apply_filters( 'wp_mail_from_name', $from_name );
 
-        $phpmailer->setFrom( $from_email, $from_name, false );
-
-        // Set destination addresses
-        if ( !is_array( $to ) )
-                $to = explode( ',', $to );
+        try {
+                $phpmailer->setFrom( $from_email, $from_name, false );
+        } catch ( phpmailerException $e ) {
+                $mail_error_data = compact( 'to', 'subject', 'message', 'headers', 'attachments' );
+                $mail_error_data['phpmailer_exception_code'] = $e->getCode();
+
+                /** This filter is documented in wp-includes/pluggable.php */
+                do_action( 'wp_mail_failed', new WP_Error( 'wp_mail_failed', $e->getMessage(), $mail_error_data ) );
+
+                return false;
+        }
 
         // Set mail's subject and body
@@ -360 +370 @@
         $phpmailer->Body    = $message;
 
-        // Use appropriate methods for handling addresses, rather than treating them as generic headers
+        // Set destination addresses, using appropriate methods for handling addresses
         $address_headers = compact( 'to', 'cc', 'bcc', 'reply_to' );