Commit 44498b0ee7 for wordpress.org

commit 44498b0ee746fcaf5c740107fbaaefe27b2bab5c
Author: John Blackbourn <johnbillion@git.wordpress.org>
Date:   Tue Dec 16 11:53:34 2025 +0000

    Mail: Update some docblocks relating to inline email attachments.

    See #28059, #64224

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


    git-svn-id: http://core.svn.wordpress.org/trunk@60698 1a063a9b-81f0-0310-95a4-ce76da25c4cd

diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php
index 1d5ee194c9..a2a062c70d 100644
--- a/wp-includes/pluggable.php
+++ b/wp-includes/pluggable.php
@@ -173,7 +173,7 @@ if ( ! function_exists( 'wp_mail' ) ) :
 	 * @since 1.2.1
 	 * @since 5.5.0 is_email() is used for email validation,
 	 *              instead of PHPMailer's default validator.
-	 * @since 6.9.0 Added $embeds parameter.
+	 * @since 6.9.0 The `$embeds` parameter was added.
 	 * @since 6.9.0 Improved Content-Type header handling for multipart messages.
 	 *
 	 * @global PHPMailer\PHPMailer\PHPMailer $phpmailer
@@ -193,6 +193,7 @@ if ( ! function_exists( 'wp_mail' ) ) :
 		 * Filters the wp_mail() arguments.
 		 *
 		 * @since 2.2.0
+		 * @since 6.9.0 The `$embeds` element was added to the `$args` array.
 		 *
 		 * @param array $args {
 		 *     Array of the `wp_mail()` arguments.
@@ -215,6 +216,7 @@ if ( ! function_exists( 'wp_mail' ) ) :
 		 * the email was successfully sent.
 		 *
 		 * @since 5.7.0
+		 * @since 6.9.0 The `$embeds` element was added to the `$atts` array.
 		 *
 		 * @param null|bool $return Short-circuit return value.
 		 * @param array     $atts {
@@ -573,7 +575,8 @@ if ( ! function_exists( 'wp_mail' ) ) :
 				 * @since 6.9.0
 				 *
 				 * @param array $args {
-				 *     An array of arguments for `addEmbeddedImage()`.
+				 *     An array of arguments for PHPMailer's addEmbeddedImage() method.
+				 *
 				 *     @type string $path        The path to the file.
 				 *     @type string $cid         The Content-ID of the image. Default: The key in the embeds array.
 				 *     @type string $name        The filename of the image.
@@ -632,9 +635,10 @@ if ( ! function_exists( 'wp_mail' ) ) :
 			 * process the request without any errors.
 			 *
 			 * @since 5.9.0
+			 * @since 6.9.0 The `$embeds` element was added to the `$mail_data` array.
 			 *
 			 * @param array $mail_data {
-			 *     An array containing the email recipient(s), subject, message, headers, and attachments.
+			 *     An array containing the email recipient(s), subject, message, headers, attachments, and embeds.
 			 *
 			 *     @type string[] $to          Email addresses to send message.
 			 *     @type string   $subject     Email subject.
@@ -656,7 +660,7 @@ if ( ! function_exists( 'wp_mail' ) ) :
 			 * @since 4.4.0
 			 *
 			 * @param WP_Error $error A WP_Error object with the PHPMailer\PHPMailer\Exception message, and an array
-			 *                        containing the mail recipient, subject, message, headers, and attachments.
+			 *                        containing the mail recipient, subject, message, headers, attachments, and embeds.
 			 */
 			do_action( 'wp_mail_failed', new WP_Error( 'wp_mail_failed', $e->getMessage(), $mail_data ) );

diff --git a/wp-includes/version.php b/wp-includes/version.php
index e8cbcadd56..f5e0070679 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '7.0-alpha-61385';
+$wp_version = '7.0-alpha-61386';

 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.