sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

compare mail headers case-insensitively and actually use the Content-Type specified. Props Nazgul. see: #4296 

git-svn-id: https://develop.svn.wordpress.org/trunk@5762 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Mark Jaquith 2007-06-26 18:28:56 +00:00
parent d0bb265782
commit e51152beb3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-includes/pluggable.php
View File

@ -193,7 +193,7 @@ function wp_mail( $to, $subject, $message, $headers = '' ) {
$content = trim( $content );
// Mainly for legacy -- process a From: header if it's there
if ( $name == 'From' ) {
if ( 'from' == strtolower($name) ) {
if ( strpos($content, '<' ) !== false ) {
// So... making my life hard again?
$from_name = substr( $content, 0, strpos( $content, '<' ) - 1 );
@ -206,7 +206,7 @@ function wp_mail( $to, $subject, $message, $headers = '' ) {
} else {
$from_name = trim( $content );
}
} elseif ( $name == 'Content-Type' ) {
} elseif ( 'content-type' == strtolower($name) ) {
if ( strpos( $content,';' ) !== false ) {
list( $type, $charset ) = explode( ';', $content );
$content_type = trim( $content_type );
@ -281,7 +281,7 @@ function wp_mail( $to, $subject, $message, $headers = '' ) {
}
// Set the content-type and charset
$phpmailer->ContentType = apply_filters( 'wp_mail_content_type', 'text/plain' );
$phpmailer->ContentType = apply_filters( 'wp_mail_content_type', $content_type );
$phpmailer->CharSet = apply_filters( 'wp_mail_charset', $charset );
// Set custom headers