WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
Built from https://develop.svn.wordpress.org/trunk@46115


git-svn-id: http://core.svn.wordpress.org/trunk@45927 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2019-09-14 20:14:54 +00:00
parent 232d97425c
commit 18bf922527
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wp-includes/pluggable.php
View File

@ -450,10 +450,13 @@ if ( ! function_exists( 'wp_mail' ) ) :
*/ */
$phpmailer->CharSet = apply_filters( 'wp_mail_charset', $charset ); $phpmailer->CharSet = apply_filters( 'wp_mail_charset', $charset );
// Set custom headers // Set custom headers.
if ( ! empty( $headers ) ) { if ( ! empty( $headers ) ) {
foreach ( (array) $headers as $name => $content ) { 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 ) );
}
} }
if ( false !== stripos( $content_type, 'multipart' ) && ! empty( $boundary ) ) { if ( false !== stripos( $content_type, 'multipart' ) && ! empty( $boundary ) ) {

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.3-alpha-46114'; $wp_version = '5.3-alpha-46115';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.