Changeset 35280

Timestamp:

10/20/2015 05:27:32 AM (9 years ago)

Author:

wonderboymusic

Message:

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

Adds unit test.

Props swissspidy, bilalcoder.
Fixes #28004.

Location:

trunk

Files:

• src/wp-includes/user-functions.php (modified) (1 diff)
• tests/phpunit/tests/user.php (modified) (1 diff)

trunk/src/wp-includes/user-functions.php

@@ -1276 +1276 @@
         $userdata = $userdata->to_array();
     }
+
     // Are we updating or creating?
     if ( ! empty( $userdata['ID'] ) ) {
         $ID = (int) $userdata['ID'];
         $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
         $user_pass = $userdata['user_pass'];

trunk/tests/phpunit/tests/user.php

@@ -818 +818 @@
         $expected = str_repeat( 'a', 48 ) . '-5';
         $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 );
     }