From 15b69a086285e05037e1bdd4ffbd66556bac7076 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Wed, 16 Sep 2015 15:13:26 +0000 Subject: [PATCH] Docs: Fix some syntactical issues with the DocBlock for `wp_mail_failed` action, introduced in [34221]. Fixes #18926. Built from https://develop.svn.wordpress.org/trunk@34239 git-svn-id: http://core.svn.wordpress.org/trunk@34203 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/pluggable.php | 7 ++++--- wp-includes/version.php | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php index 8e67accf3f..e26b36ce28 100644 --- a/wp-includes/pluggable.php +++ b/wp-includes/pluggable.php @@ -536,13 +536,14 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array() } catch ( phpmailerException $e ) { $mail_error_data = compact( $to, $subject, $message, $headers, $attachments ); + /** - * Fires after a phpmailerException is caught + * Fires after a phpmailerException is caught. * * @since 4.4.0 * - * @param WP_Error A WP_Error object with the phpmailerException code, message and an array - * containing the mail recipient, subject, message, headers and attachments + * @param WP_Error $error A WP_Error object with the phpmailerException code, message, and an array + * containing the mail recipient, subject, message, headers, and attachments. */ do_action( 'wp_mail_failed', new WP_Error( $e->getCode(), $e->getMessage(), $mail_error_data ) ); diff --git a/wp-includes/version.php b/wp-includes/version.php index 3d7bee1d16..a3dfade96f 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.4-alpha-34238'; +$wp_version = '4.4-alpha-34239'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.