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

Timestamp:

09/14/2019 08:13:37 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Mail: Avoid setting duplicate MIME-Version and X-Mailer headers in wp_mail(), they are added automatically by PHPMailer.

Props lbenicio, junktrunk, danieltj, studyboi, bennemann.
Fixes #43542.

File:

• trunk/src/wp-includes/pluggable.php (modified) (1 diff)

trunk/src/wp-includes/pluggable.php

@@ -451 +451 @@
         $phpmailer->CharSet = apply_filters( 'wp_mail_charset', $charset );
 
-        // Set custom headers
+        // Set custom headers.
         if ( ! empty( $headers ) ) {
             foreach ( (array) $headers as $name => $content ) {
-                $phpmailer->addCustomHeader( sprintf( '%1$s: %2$s', $name, $content ) );
+                // Only add custom headers not added automatically by PHPMailer.
+                if ( ! in_array( $name, array( 'MIME-Version', 'X-Mailer') ) ) {
+                    $phpmailer->addCustomHeader( sprintf( '%1$s: %2$s', $name, $content ) );
+                }
             }