Users: In `wp_insert_user()`, account for the `wp_pre_insert_user_data` filter returning empty data.
Props juliobox, SergeyBiryukov. Fixes #47902. git-svn-id: https://develop.svn.wordpress.org/trunk@45858 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
051aa3847c
commit
31a6309902
|
@ -1794,6 +1794,10 @@ function wp_insert_user( $userdata ) {
|
||||||
*/
|
*/
|
||||||
$data = apply_filters( 'wp_pre_insert_user_data', $data, $update, $update ? (int) $ID : null );
|
$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 ( $update ) {
|
||||||
if ( $user_email !== $old_user_data->user_email ) {
|
if ( $user_email !== $old_user_data->user_email ) {
|
||||||
$data['user_activation_key'] = '';
|
$data['user_activation_key'] = '';
|
||||||
|
|
|
@ -961,6 +961,23 @@ class Tests_User extends WP_UnitTestCase {
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->assertWPError( $u );
|
$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() );
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue