diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php index 65ee3d253d..b05d1835b9 100644 --- a/wp-includes/ms-functions.php +++ b/wp-includes/ms-functions.php @@ -543,7 +543,7 @@ function wpmu_validate_user_signup( $user_name, $user_email ) { // Has someone already signed up for this username? $signup = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->signups WHERE user_login = %s", $user_name ) ); - if ( null != $signup ) { + if ( $signup instanceof stdClass ) { $registered_at = mysql2date( 'U', $signup->registered ); $now = time(); $diff = $now - $registered_at; @@ -556,7 +556,7 @@ function wpmu_validate_user_signup( $user_name, $user_email ) { } $signup = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->signups WHERE user_email = %s", $user_email ) ); - if ( null != $signup ) { + if ( $signup instanceof stdClass ) { $diff = time() - mysql2date( 'U', $signup->registered ); // If registered more than two days ago, cancel registration and let this signup go through. if ( $diff > 2 * DAY_IN_SECONDS ) { @@ -724,7 +724,7 @@ function wpmu_validate_blog_signup( $blogname, $blog_title, $user = '' ) { // Has someone already signed up for this domain? // TODO: Check email too? $signup = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->signups WHERE domain = %s AND path = %s", $mydomain, $path ) ); - if ( ! empty( $signup ) ) { + if ( $signup instanceof stdClass ) { $diff = time() - mysql2date( 'U', $signup->registered ); // If registered more than two days ago, cancel registration and let this signup go through. if ( $diff > 2 * DAY_IN_SECONDS ) { diff --git a/wp-includes/version.php b/wp-includes/version.php index bacc9e248b..1b9784e0d2 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.6-alpha-49205'; +$wp_version = '5.6-alpha-49206'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.