Mail: Reset PHPMailer properties between use.

Props xknown, martinkrcho, tykoted.


git-svn-id: https://develop.svn.wordpress.org/trunk@54529 602fd350-edb4-49c9-b593-d223f7449a82

Author: audrasjb

src/wp-includes/pluggable.php

@@ -353,6 +353,8 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array()
 		$phpmailer->clearAttachments();
 		$phpmailer->clearCustomHeaders();
 		$phpmailer->clearReplyTos();
+		$phpmailer->Body    = '';
+		$phpmailer->AltBody = '';
 
 		// Set "From" name and email.
 

tests/phpunit/tests/mail.php

@@ -475,4 +475,21 @@ public function test_wp_mail_can_be_shortcircuited() {
 		$this->assertTrue( $result1 );
 		$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( '[email protected]', 'Test 1', '<p>demo</p>', 'Content-Type: text/html' );
+		remove_action( 'phpmailer_init', $wp_mail_set_text_message );
+		wp_mail( '[email protected]', 'Test 2', 'test2' );
+		$phpmailer = $GLOBALS['phpmailer'];
+		$this->assertNotSame( 'user1', $phpmailer->AltBody );
+	}
 }