Don't add MIME-Version header twice (PHPMailer already adds it). see #4296
git-svn-id: http://svn.automattic.com/wordpress/trunk@5763 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
d9d5fde1e7
commit
9a91481a2b
@ -170,11 +170,9 @@ function wp_mail( $to, $subject, $message, $headers = '' ) {
|
|||||||
// Compact the input, apply the filters, and extract them back out
|
// Compact the input, apply the filters, and extract them back out
|
||||||
extract( apply_filters( 'wp_mail', compact( 'to', 'subject', 'message', 'headers' ) ), EXTR_SKIP );
|
extract( apply_filters( 'wp_mail', compact( 'to', 'subject', 'message', 'headers' ) ), EXTR_SKIP );
|
||||||
|
|
||||||
// Default headers
|
// Headers
|
||||||
if ( empty( $headers ) ) {
|
if ( empty( $headers ) ) {
|
||||||
$headers = array(
|
$headers = array();
|
||||||
'MIME-Version' => '1.0'
|
|
||||||
);
|
|
||||||
} elseif ( !is_array( $headers ) ) {
|
} elseif ( !is_array( $headers ) ) {
|
||||||
// Explode the headers out, so this function can take both
|
// Explode the headers out, so this function can take both
|
||||||
// string headers and an array of headers.
|
// string headers and an array of headers.
|
||||||
|
Loading…
Reference in New Issue
Block a user