Ticket #28473: 28473.patch

wp-includes/pluggable.php

@@ -275 +275 @@
                         // Explode the headers out, so this function can take both
                         // string headers and an array of headers.
                         $tempheaders = explode( "\n", str_replace( "\r\n", "\n", $headers ) );
+                        
+                        // Line which starts with space is a continuation of previous line, need to keep them as one
+                        for ($index = 0; $index < count($tempheaders); $index ++) {
+                          if ($index > 0 && $tempheaders[$index] && $tempheaders[$index][0] === ' ') {
+                            $tempheaders[$index - 1] .= "\n" . $tempheaders[$index];
+                            array_splice($tempheaders, $index, 1);
+                            $index--;
+                          }
+                        }
                 } else {
                         $tempheaders = $headers;
                 }
@@ -308 +317 @@
                                                         $from_name = substr( $content, 0, strpos( $content, '<' ) - 1 );
                                                         $from_name = str_replace( '"', '', $from_name );
                                                         $from_name = trim( $from_name );
+                                                        if (function_exists('mb_decode_mimeheader')):
+                                                          $from_name = mb_decode_mimeheader($from_name);
+                                                        endif;
 
                                                         $from_email = substr( $content, strpos( $content, '<' ) + 1 );
                                                         $from_email = str_replace( '>', '', $from_email );