Ticket #53826: 53826.diff

src/wp-includes/pluggable.php

@@ -537 +537 @@
                  */
                 do_action_ref_array( 'phpmailer_init', array( &$phpmailer ) );
 
+                $mail_data = compact( 'to', 'subject', 'message', 'headers', 'attachments' );
+
                 // Send!
                 try {
-                        return $phpmailer->send();
-                } catch ( PHPMailer\PHPMailer\Exception $e ) {
+                        $send = $phpmailer->send();
 
-                        $mail_error_data                             = compact( 'to', 'subject', 'message', 'headers', 'attachments' );
-                        $mail_error_data['phpmailer_exception_code'] = $e->getCode();
+                        /**
+                         * Fires after PHPMailer has successfully sent a mail.
+                         *
+                         * The firing of this action does not necessarily mean that the recipient received the
+                         * email successfully. It only means that the `send` method above was able to
+                         * process the request without any errors.
+                         *
+                         * @since 5.9.0
+                         *
+                         * @param array $mail_data An array containing the mail recipient, subject, message, headers, and attachments.
+                         */
+                        do_action( 'wp_mail_succeeded', $mail_data );
 
+                        return $send;
+                } catch ( PHPMailer\PHPMailer\Exception $e ) {
+                        $mail_data['phpmailer_exception_code'] = $e->getCode();
                         /**
                          * Fires after a PHPMailer\PHPMailer\Exception is caught.
                          *
@@ -553 +567 @@
                          * @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.
                          */
-                        do_action( 'wp_mail_failed', new WP_Error( 'wp_mail_failed', $e->getMessage(), $mail_error_data ) );
+                        do_action( 'wp_mail_failed', new WP_Error( 'wp_mail_failed', $e->getMessage(), $mail_data ) );
 
                         return false;
                 }