Changeset 45858 for trunk

Timestamp:

08/20/2019 05:25:02 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Users: In wp_insert_user(), account for the wp_pre_insert_user_data filter returning empty data.

Props juliobox, SergeyBiryukov.
Fixes #47902.

Location:

trunk

Files:

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

trunk/src/wp-includes/user.php

@@ -1795 +1795 @@
     $data = apply_filters( 'wp_pre_insert_user_data', $data, $update, $update ? (int) $ID : null );
 
+    if ( empty( $data ) || ! is_array( $data ) ) {
+        return new WP_Error( 'empty_data', __( 'Not enough data to create this user.' ) );
+    }
+
     if ( $update ) {
         if ( $user_email !== $old_user_data->user_email ) {

trunk/tests/phpunit/tests/user.php

@@ -962 +962 @@
 
         $this->assertWPError( $u );
+        $this->assertSame( 'invalid_user_id', $u->get_error_code() );
+    }
+
+    /**
+     * @ticket 47902
+     */
+    public function test_wp_insert_user_with_empty_data() {
+        global $wpdb;
+
+        add_filter( 'wp_pre_insert_user_data', '__return_empty_array' );
+
+        $u = self::factory()->user->create();
+
+        remove_filter( 'wp_pre_insert_user_data', '__return_empty_array' );
+
+        $this->assertWPError( $u );
+        $this->assertSame( 'empty_data', $u->get_error_code() );
     }