From 1b467973662039e4dadcda8fa20194f2ddc89c28 Mon Sep 17 00:00:00 2001
From: audrasjb <audrasjb@git.wordpress.org>
Date: Mon, 17 Oct 2022 11:42:11 +0000
Subject: [PATCH] Mail: Reset PHPMailer properties between use.

Props xknown, martinkrcho, tykoted.

Built from https://develop.svn.wordpress.org/trunk@54529


git-svn-id: http://core.svn.wordpress.org/trunk@54084 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/pluggable.php | 2 ++
 wp-includes/version.php   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php
index 5d65e53f8b..c2a975d896 100644
--- a/wp-includes/pluggable.php
+++ b/wp-includes/pluggable.php
@@ -353,6 +353,8 @@ if ( ! function_exists( 'wp_mail' ) ) :
 		$phpmailer->clearAttachments();
 		$phpmailer->clearCustomHeaders();
 		$phpmailer->clearReplyTos();
+		$phpmailer->Body    = '';
+		$phpmailer->AltBody = '';
 
 		// Set "From" name and email.
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index b5b989964a..093eb05d59 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.1-RC1-54528';
+$wp_version = '6.1-RC1-54529';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.