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

Timestamp:

11/02/16 04:26:18 (8 months ago)

Author:

helen

Message:

Mail: Set a better error code when triggering wp_mail_failed.

This error code is now... wait for it... wp_mail_failed. Previously, this would have been the originating PHPMailer error code, which could be 0, which would then fail (pass?) the empty() check in the WP_Error constructor, thereby rendering the error object fairly useless. The PHPMailer error code is now located within the WP_Error data.

props Kau-Boy, stephenharris.
fixes #35598.

File:

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

trunk/src/wp-includes/pluggable.php

@@ -473 +473 @@
 
         $mail_error_data = compact( 'to', 'subject', 'message', 'headers', 'attachments' );
+        $mail_error_data['phpmailer_exception_code'] = $e->getCode();
 
         /**
@@ -479 +480 @@
          * @since 4.4.0
          *
-         * @param WP_Error $error A WP_Error object with the phpmailerException code, message, and an array
+         * @param WP_Error $error A WP_Error object with the phpmailerException message, and an array
          *                        containing the mail recipient, subject, message, headers, and attachments.
          */
-        do_action( 'wp_mail_failed', new WP_Error( $e->getCode(), $e->getMessage(), $mail_error_data ) );
+        do_action( 'wp_mail_failed', new WP_Error( 'wp_mail_failed', $e->getMessage(), $mail_error_data ) );
 
         return false;