Ticket #28473: 28473-2.diff

src/wp-includes/pluggable.php

@@ -223 +223 @@
                         // 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;
                 }
@@ -258 +267 @@
                                                                 $from_name = substr( $content, 0, $bracket_pos - 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 );
+                                                                }
                                                         }
 
                                                         $from_email = substr( $content, $bracket_pos + 1 );
@@ -268 +280 @@
                                                 } elseif ( '' !== trim( $content ) ) {
                                                         $from_email = trim( $content );
                                                 }
+
                                                 break;
                                         case 'content-type':
                                                 if ( strpos( $content, ';' ) !== false ) {
@@ -2459 +2472 @@
         return $r;
 }
 endif;
-

tests/phpunit/tests/mail.php

@@ -307 +307 @@
 
                 $this->assertNotContains( 'quoted-printable', $GLOBALS['phpmailer']->mock_sent[0]['header'] );
         }
+
+        /**
+         *
+         */
+        function test_wp_mail_multiline_header() {
+                $headers = 'From: =?UTF-8?B?0YLQtdGB0YIg0YLQtdGB0YIg0YLQtdGB0YIg0YLQtdGB0YIg0YLQtdGB0YIg?=';
+                $headers .= "\n =?UTF-8?B?0YLQtdGB0YIg0YLQtdGB0YI=?= <test@example.com>";
+                wp_mail( 'test@test.com', 'subject', 'message', $headers );
+
+                $mailer = tests_retrieve_phpmailer_instance();
+                $this->assertEquals( 'test@example.com', $mailer->From );
+                $this->assertEquals(
+                        'тест тест тест тест тест тест тест',
+                        $mailer->FromName
+                );
+        }
 }