Changeset 54539

Timestamp:

10/17/2022 12:34:37 PM (2 years ago)

Author:

audrasjb

Message:

Mail: Reset PHPMailer properties between use.

Props xknown, martinkrcho, tykoted.
Merges [54529] to the 6.0 branch.

Location:

branches/6.0

Files:

• . (modified) (1 prop)
• src/wp-includes/pluggable.php (modified) (1 diff)
• tests/phpunit/tests/mail.php (modified) (1 diff)

branches/6.0/src/wp-includes/pluggable.php

@@ -362 +362 @@
         $phpmailer->clearCustomHeaders();
         $phpmailer->clearReplyTos();
+        $phpmailer->Body    = '';
+        $phpmailer->AltBody = '';
 
         // Set "From" name and email.

branches/6.0/tests/phpunit/tests/mail.php

@@ -454 +454 @@
         $this->assertFalse( $result2 );
     }
+
+    /**
+     * Tests that AltBody is reset between each wp_mail call.
+     *
+     * @covers :wp_mail
+     */
+    public function test_wp_mail_resets_properties() {
+        $wp_mail_set_text_message = function ( $phpmailer ) {
+            $phpmailer->AltBody = 'user1';
+        };
+        add_action( 'phpmailer_init', $wp_mail_set_text_message );
+        wp_mail( 'user1@example.localhost', 'Test 1', '<p>demo</p>', 'Content-Type: text/html' );
+        remove_action( 'phpmailer_init', $wp_mail_set_text_message );
+        wp_mail( 'user2@example.localhost', 'Test 2', 'test2' );
+        $phpmailer = $GLOBALS['phpmailer'];
+        $this->assertNotSame( 'user1', $phpmailer->AltBody );
+    }
 }