Changeset 61131 for trunk/src/wp-includes/pluggable.php

Timestamp:

11/04/2025 05:18:55 PM (5 months ago)

Author:

johnjamesjacoby

Message:

Mail: reset Encoding to 8-bit in wp_mail().

The PHPMailer library may automatically switch its encoding based on various internal factors.

This commit fixes a bug where the $phpmailer global was unintentionally persisting its Encoding property from the first wp_mail() call to all subsequent calls.

This includes unit tests to verify the fix is accurate, and a change to the mock-mailer helper that worked around this bug just-in-time when running the test suite.

Props codebuddy, dilip2615, rishabhwp, sajjad67, sirlouen, stephenharris.

Fixes #33972.

File:

• trunk/src/wp-includes/pluggable.php (modified) (1 diff)

trunk/src/wp-includes/pluggable.php

@@ -384 +384 @@
         $phpmailer->Body    = '';
         $phpmailer->AltBody = '';
+
+        /*
+         * Reset encoding to 8-bit, as it may have been automatically downgraded
+         * to 7-bit by PHPMailer (based on the body contents) in a previous call
+         * to wp_mail().
+         *
+         * See https://core.trac.wordpress.org/ticket/33972
+         */
+        $phpmailer->Encoding = PHPMailer\PHPMailer\PHPMailer::ENCODING_8BIT;
 
         // Set "From" name and email.