Ticket #44548: 44548.patch

src/wp-includes/pluggable.php

@@ -453 +453 @@
                  */
                 $phpmailer->CharSet = apply_filters( 'wp_mail_charset', $charset );
 
+                /**
+                 * Filters the default wp_mail() encoding.
+                 *
+                 * @since 5.0.0
+                 *
+                 * @param string $encoding Default email encoding.
+                 */
+                $phpmailer->Encoding = apply_filters( 'wp_mail_encoding', 'base64' );
+
                 // Set custom headers
                 if ( ! empty( $headers ) ) {
                         foreach ( (array) $headers as $name => $content ) {

tests/phpunit/includes/mock-mailer.php

@@ -5 +5 @@
         var $mock_sent = array();
 
         function preSend() {
-                $this->Encoding = '8bit';
                 return parent::preSend();
         }
 

tests/phpunit/tests/mail.php

@@ -80 +80 @@
                 $mailer = tests_retrieve_phpmailer_instance();
 
                 // We need some better assertions here but these catch the failure for now.
-                $this->assertEquals( $body, $mailer->get_sent()->body );
+                $this->assertEquals( $body, base64_decode( $mailer->get_sent()->body ) );
                 $this->assertTrue( strpos( $mailer->get_sent()->header, 'boundary="----=_Part_4892_25692638.1192452070893"' ) > 0 );
                 $this->assertTrue( strpos( $mailer->get_sent()->header, 'charset=' ) > 0 );
         }
@@ -112 +112 @@
                 $this->assertEquals( 'The Carbon Guy', $mailer->get_recipient( 'cc' )->name );
                 $this->assertEquals( 'bcc@bcc.com', $mailer->get_recipient( 'bcc' )->address );
                 $this->assertEquals( 'The Blind Carbon Guy', $mailer->get_recipient( 'bcc' )->name );
-                $this->assertEquals( $message . "\n", $mailer->get_sent()->body );
+                $this->assertEquals( $message, base64_decode( $mailer->get_sent()->body ) );
         }
 
         /**
@@ -132 +132 @@
                 $this->assertEquals( 'Name', $mailer->get_recipient( 'to' )->name );
                 $this->assertEquals( 'another_address@different-tld.com', $mailer->get_recipient( 'to', 0, 1 )->address );
                 $this->assertEquals( 'Another Name', $mailer->get_recipient( 'to', 0, 1 )->name );
-                $this->assertEquals( $message . "\n", $mailer->get_sent()->body );
+                $this->assertEquals( $message, base64_decode( $mailer->get_sent()->body ) );
         }
 
         function test_wp_mail_multiple_to_addresses() {
@@ -145 +145 @@
                 $mailer = tests_retrieve_phpmailer_instance();
                 $this->assertEquals( 'address@tld.com', $mailer->get_recipient( 'to' )->address );
                 $this->assertEquals( 'another_address@different-tld.com', $mailer->get_recipient( 'to', 0, 1 )->address );
-                $this->assertEquals( $message . "\n", $mailer->get_sent()->body );
+                $this->assertEquals( $message, base64_decode( $mailer->get_sent()->body ) );
         }
 
         /**
@@ -160 +160 @@
 
                 $mailer = tests_retrieve_phpmailer_instance();
                 $this->assertEquals( 'address@tld.com', $mailer->get_recipient( 'to' )->address );
-                $this->assertEquals( $message . "\n", $mailer->get_sent()->body );
+                $this->assertEquals( $message, base64_decode( $mailer->get_sent()->body ) );
         }
 
         /**
@@ -391 +391 @@
                 $this->assertEquals( 'wp_mail_failed', $call_args[0]->get_error_code() );
                 $this->assertEquals( $expected_error_data, $call_args[0]->get_error_data() );
         }
+
+        /**
+         * @ticket 44548
+         */
+        public function test_wp_mail_should_encode_base64_with_japanese()
+        {
+                $to = 'hello@example.com';
+                $subject = "けっして平生に説明人はもっとその活動たたまでをしがありましにもお話かけ合わうませから、どうには賑わすたくずますな。";
+                $message = "私は同年どうぞこういう返事事に対するののうちにやっただろ。まあ事実を料理院は同時にそのお話でんばかりからなりていでからも助力知れますますば、どうにはなりたますたます。";
+                wp_mail( $to, $subject, $message );
+                $mailer = tests_retrieve_phpmailer_instance();
+                $this->assertSame( 'hello@example.com', $mailer->get_recipient( 'to' )->address );
+
+                $this->assertSame( $subject, $mailer->get_sent()->subject );
+                $this->assertSame( $message, base64_decode( $mailer->get_sent()->body ) );
+                $this->assertRegExp( '/Content-Transfer-Encoding:\s+?base64/', $mailer->get_sent()->header );
+        }
 }

tests/phpunit/tests/privacy/wpPrivacySendPersonalDataExportEmail.php

@@ -81 +81 @@
                 $this->assertSame( 'request-confirmed', get_post_status( self::$request_id ) );
                 $this->assertSame( self::$requester_email, $mailer->get_recipient( 'to' )->address );
                 $this->assertContains( 'Personal Data Export', $mailer->get_sent()->subject );
-                $this->assertContains( $archive_url, $mailer->get_sent()->body );
-                $this->assertContains( 'please download it', $mailer->get_sent()->body );
+                $this->assertContains( $archive_url, base64_decode( $mailer->get_sent()->body ) );
+                $this->assertContains( 'please download it', base64_decode( $mailer->get_sent()->body ) );
                 $this->assertTrue( $email_sent );
         }
 
@@ -128 +128 @@
                 remove_filter( 'wp_privacy_export_expiration', array( $this, 'modify_export_expiration' ) );
 
                 $mailer = tests_retrieve_phpmailer_instance();
-                $this->assertContains( 'we will automatically delete the file on December 18, 2017,', $mailer->get_sent()->body );
+                $this->assertContains( 'we will automatically delete the file on December 18, 2017,',
+                                base64_decode( $mailer->get_sent()->body ) );
         }
 
         /**
@@ -155 +156 @@
                 remove_filter( 'wp_privacy_personal_data_email_content', array( $this, 'modify_email_content' ) );
 
                 $mailer = tests_retrieve_phpmailer_instance();
-                $this->assertContains( 'Custom content for request ID: ' . self::$request_id, $mailer->get_sent()->body );
+                $this->assertContains( 'Custom content for request ID: ' . self::$request_id,
+                                base64_decode( $mailer->get_sent()->body ) );
         }
 
         /**