WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix the inline documentation syntax in the hook docs for the `send_email_change_email` filter, added in 4.3. 

See [32820]. See #32891.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33215 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Drew Jaynes 2015-07-13 22:08:24 +00:00
parent 96ed7056cd
commit 284b726bfb
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wp-includes/user.php
View File

@ -2156,7 +2156,7 @@ function wp_update_user($userdata) {
$userdata['user_pass'] = wp_hash_password( $userdata['user_pass'] ); $userdata['user_pass'] = wp_hash_password( $userdata['user_pass'] );
/** /**
* Filter whether to stop the sending of the password change email. * Filter whether send the password change email.
* *
* @since 4.3.0 * @since 4.3.0
* *
@ -2172,13 +2172,14 @@ function wp_update_user($userdata) {
if ( isset( $userdata['user_email'] ) && $user['user_email'] !== $userdata['user_email'] ) { if ( isset( $userdata['user_email'] ) && $user['user_email'] !== $userdata['user_email'] ) {
/** /**
* Filter to stop the sending of the email change email. * Filter whether to send the email change email.
* *
* @since 4.3.0 * @since 4.3.0
* @see wp_insert_user() For $user and $userdata fields.
* *
* @param bool Return false to not send the email. * @see wp_insert_user() For `$user` and `$userdata` fields.
* @param array $user The original user array. *
* @param bool $send Whether to send the email.
* @param array $user The original user array.
* @param array $userdata The updated user array. * @param array $userdata The updated user array.
* *
*/ */

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.3-beta2-33242'; $wp_version = '4.3-beta2-33243';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.