sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Users: when calling wp_insert_user() with an valid user ID, return WP_Error instead of arbitrarily updating user meta.

Browse Source 
Adds unit test.

Props swissspidy, bilalcoder.
Fixes #28004.


git-svn-id: https://develop.svn.wordpress.org/trunk@35280 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor 2015-10-20 05:27:32 +00:00
parent 6ae2e24d28
commit 91d55f97c2
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/wp-includes/user-functions.php
View File

@ -1275,11 +1275,17 @@ function wp_insert_user( $userdata ) {
} elseif ( $userdata instanceof WP_User ) { } elseif ( $userdata instanceof WP_User ) {
$userdata = $userdata->to_array(); $userdata = $userdata->to_array();
} }
// Are we updating or creating? // Are we updating or creating?
if ( ! empty( $userdata['ID'] ) ) { if ( ! empty( $userdata['ID'] ) ) {
$ID = (int) $userdata['ID']; $ID = (int) $userdata['ID'];
$update = true; $update = true;
$old_user_data = WP_User::get_data_by( 'id', $ID ); $old_user_data = get_userdata( $ID );
if ( ! $old_user_data ) {
return new WP_Error( 'invalid_user_id', __( 'Invalid user ID.' ) );
}
// hashed in wp_update_user(), plaintext if called directly // hashed in wp_update_user(), plaintext if called directly
$user_pass = $userdata['user_pass']; $user_pass = $userdata['user_pass'];
} else { } else {

14
tests/phpunit/tests/user.php
View File

@ -819,6 +819,20 @@ class Tests_User extends WP_UnitTestCase {
$this->assertSame( $expected, $user->user_nicename ); $this->assertSame( $expected, $user->user_nicename );
} }
/**
* @ticket 28004
*/
public function test_wp_insert_user_with_invalid_user_id() {
$u = wp_insert_user( array(
'ID' => 123,
'user_login' => 'whatever',
'user_email' => 'whatever@example.com',
'user_pass' => 'password',
) );
$this->assertWPError( $u );
}
function test_changing_email_invalidates_password_reset_key() { function test_changing_email_invalidates_password_reset_key() {
global $wpdb; global $wpdb;