Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-11-16 15:46:04 +01:00
Code Issues Projects Releases Wiki Activity

Reset Password: Add a missing new operator for WP_Error in get_password_reset_key().

Browse Source 
Missed in [34923].

Fixes #34180.

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


git-svn-id: http://core.svn.wordpress.org/trunk@35728 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling 2015-12-04 15:31:26 +00:00
parent de586c98c4
commit 7250749032
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/user.php
View File

@ -1971,7 +1971,7 @@ function get_password_reset_key( $user ) {
$hashed = time() . ':' . $wp_hasher->HashPassword( $key ); $hashed = time() . ':' . $wp_hasher->HashPassword( $key );
$key_saved = $wpdb->update( $wpdb->users, array( 'user_activation_key' => $hashed ), array( 'user_login' => $user->user_login ) ); $key_saved = $wpdb->update( $wpdb->users, array( 'user_activation_key' => $hashed ), array( 'user_login' => $user->user_login ) );
if ( false === $key_saved ) { if ( false === $key_saved ) {
return WP_Error( 'no_password_key_update', __( 'Could not save password reset key to database.' ) ); return new WP_Error( 'no_password_key_update', __( 'Could not save password reset key to database.' ) );
} }
return $key; return $key;

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.4-RC1-35763'; $wp_version = '4.4-RC1-35764';
/** /**
* 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.