Changeset 49206

Timestamp:

10/19/2020 08:18:44 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Use more specific checks for $wpdb->get_row() results.

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".

This affects:

• wpmu_validate_user_signup()
• wpmu_validate_blog_signup()

Props jrf.
See #50767.

File:

• trunk/src/wp-includes/ms-functions.php (modified) (3 diffs)

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

@@ -544 +544 @@
     // 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();
@@ -557 +557 @@
 
     $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.
@@ -725 +725 @@
     // 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.