From 2adb62314f4f5d72ba210201538e08d51bcff991 Mon Sep 17 00:00:00 2001 From: jrfnl Date: Sun, 18 Oct 2020 08:18:56 +0200 Subject: [PATCH] QA: remove assumption in code Use a more stable condition. If `$wpdb->get_row()` is successful and the `$output` parameter has not been set, the output will be an instance of `stdClass`, so test to confirm that instead of testing against "not null". --- src/wp-includes/ms-functions.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wp-includes/ms-functions.php b/src/wp-includes/ms-functions.php index 65ee3d253d..0ad1f219a8 100644 --- a/src/wp-includes/ms-functions.php +++ b/src/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 ) { -- 2.28.0.windows.1