From 96ed7056cdd593bcadb0980eed9a976fee3e8631 Mon Sep 17 00:00:00 2001 From: Drew Jaynes Date: Mon, 13 Jul 2015 22:05:25 +0000 Subject: [PATCH] Fix the inline documentation syntax in the hook docs for the `send_pass_change_email` filter, added in 4.3. See [32820]. See #32891. Built from https://develop.svn.wordpress.org/trunk@33242 git-svn-id: http://core.svn.wordpress.org/trunk@33214 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/user.php | 10 ++++++---- wp-includes/version.php | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/wp-includes/user.php b/wp-includes/user.php index e0ddcf013d..e3605f7cb9 100644 --- a/wp-includes/user.php +++ b/wp-includes/user.php @@ -2154,14 +2154,16 @@ function wp_update_user($userdata) { // If password is changing, hash it now $plaintext_pass = $userdata['user_pass']; $userdata['user_pass'] = wp_hash_password( $userdata['user_pass'] ); + /** - * Filter to stop the sending of the password change email. + * Filter whether to stop the sending of the password change email. * * @since 4.3.0 - * @see wp_insert_user() For $user and $userdata fields. * - * @param bool Return false to not send the email. - * @param array $user The original user array. + * @see wp_insert_user() For `$user` and `$userdata` fields. + * + * @param bool $send Whether to send the email. + * @param array $user The original user array. * @param array $userdata The updated user array. * */ diff --git a/wp-includes/version.php b/wp-includes/version.php index ec6457f1c1..fb4d1337ec 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.3-beta2-33241'; +$wp_version = '4.3-beta2-33242'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.