Ticket #35781: 35781.2.patch

src/wp-includes/pluggable.php

@@ -181 +181 @@
          * @param array $args A compacted array of wp_mail() arguments, including the "to" email,
          *                    subject, message, headers, and attachments values.
          */
-        $atts = apply_filters( 'wp_mail', compact( 'to', 'subject', 'message', 'headers', 'attachments' ) );
+        $atts = apply_filters( 'wp_mail', compact( 'to', 'subject', 'message', $headers, $attachments ) );
 
         if ( isset( $atts['to'] ) ) {
                 $to = $atts['to'];
@@ -479 +479 @@
                 return $phpmailer->Send();
         } catch ( phpmailerException $e ) {
 
-                $mail_error_data = compact( 'to', 'subject', 'message', 'headers', 'attachments' );
+                $mail_error_data = compact( 'to', 'subject', 'message', $headers, $attachments );
 
                 /**
                  * Fires after a phpmailerException is caught.