Changeset 5762

Timestamp:

06/26/2007 06:28:56 PM (17 years ago)

Author:

markjaquith

Message:

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

File:

• trunk/wp-includes/pluggable.php (modified) (3 diffs)

trunk/wp-includes/pluggable.php

@@ -194 +194 @@
 
                 // 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?
@@ -207 +207 @@
                         $from_name = trim( $content );
                     }
-                } elseif ( $name == 'Content-Type' ) {
+                } elseif ( 'content-type' == strtolower($name) ) {
                     if ( strpos( $content,';' ) !== false ) {
                         list( $type, $charset ) = explode( ';', $content );
@@ -282 +282 @@
 
     // 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 );