Changeset 5764

Timestamp:

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

Author:

markjaquith

Message:

Correctly grab Content-Type from old-school headers, skip blank headers. fixes #4296

File:

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

trunk/wp-includes/pluggable.php

@@ -184 +184 @@
             // Iterate through the raw headers
             foreach ( $tempheaders as $header ) {
+                if ( strpos($header, ':') === false )
+                    continue;
                 // Explode them out
                 list( $name, $content ) = explode( ':', trim( $header ), 2 );
@@ -208 +210 @@
                     if ( strpos( $content,';' ) !== false ) {
                         list( $type, $charset ) = explode( ';', $content );
-                        $content_type = trim( $content_type );
+                        $content_type = trim( $type );
                         $charset = trim( str_replace( array( 'charset=', '"' ), '', $charset ) );
                     } else {
@@ -267 +269 @@
     }
 
+    $content_type = apply_filters( 'wp_mail_content_type', $content_type );
+
     // Set whether it's plaintext or not, depending on $content_type
     if ( $content_type == 'text/html' ) {
@@ -280 +284 @@
 
     // Set the content-type and charset
-    $phpmailer->ContentType = apply_filters( 'wp_mail_content_type', $content_type );
     $phpmailer->CharSet = apply_filters( 'wp_mail_charset', $charset );
 
@@ -520 +523 @@
     }
 
-    $message_headers = "MIME-Version: 1.0\n"
-        . "$from\n"
+    $message_headers = "$from\n"
         . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";