Changeset 55866

Timestamp:

05/29/2023 04:24:43 PM (14 months ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Use strict comparison in wp-admin/includes/schema.php.

Follow-up to [12756], [12862], [12880], [13070], [14485], [17928], [18899], [41348], [43628].

Props faisalahammad, aristath, poena, afercia, SergeyBiryukov.
Fixes #58042, #58047. See #57839.

File:

• trunk/src/wp-admin/includes/schema.php (modified) (7 diffs)

trunk/src/wp-admin/includes/schema.php

@@ -39 +39 @@
     $charset_collate = $wpdb->get_charset_collate();
 
-    if ( $blog_id && $blog_id != $wpdb->blogid ) {
+    if ( $blog_id && = $wpdb->blogid ) {
         $old_blog_id = $wpdb->set_blog_id( $blog_id );
     }
@@ -984 +984 @@
     global $wpdb, $current_site, $wp_rewrite;
 
+
+
     $errors = new WP_Error();
     if ( '' === $domain ) {
@@ -995 +997 @@
     $network_exists = false;
     if ( is_multisite() ) {
-        if ( get_network( (int) $network_id ) ) {
+        if ( get_network( $network_id ) ) {
             $errors->add( 'siteid_exists', __( 'The network already exists.' ) );
         }
     } else {
-        if ( $network_id == $wpdb->get_var( $wpdb->prepare( "SELECT id FROM $wpdb->site WHERE id = %d", $network_id ) ) ) {
+        if ( $network_id === (int) $wpdb->get_var(
+            $wpdb->prepare( "SELECT id FROM $wpdb->site WHERE id = %d", $network_id )
+        ) ) {
             $errors->add( 'siteid_exists', __( 'The network already exists.' ) );
         }
@@ -1012 +1016 @@
     }
 
-    if ( 1 == $network_id ) {
+    if ( 1 == $network_id ) {
         $wpdb->insert(
             $wpdb->site,
@@ -1041 +1045 @@
     );
 
-    $site_user = get_userdata( (int) $wpdb->get_var( $wpdb->prepare( "SELECT meta_value FROM $wpdb->sitemeta WHERE meta_key = %s AND site_id = %d", 'admin_user_id', $network_id ) ) );
+    $site_user = get_userdata(
+        (int) $wpdb->get_var(
+            $wpdb->prepare(
+                "SELECT meta_value
+                FROM $wpdb->sitemeta
+                WHERE meta_key = %s AND site_id = %d",
+                'admin_user_id',
+                $network_id
+            )
+        )
+    );
 
     /*
@@ -1103 +1117 @@
         if ( is_wp_error( $page ) ) {
             $errstr = $page->get_error_message();
-        } elseif ( 200 == wp_remote_retrieve_response_code( $page ) ) {
+        } elseif ( 200 == wp_remote_retrieve_response_code( $page ) ) {
                 $vhost_ok = true;
         }
@@ -1169 +1183 @@
     $allowed_themes = array( $stylesheet => true );
 
-    if ( $template != $stylesheet ) {
+    if ( $template != $stylesheet ) {
         $allowed_themes[ $template ] = true;
     }
 
-    if ( WP_DEFAULT_THEME != $stylesheet && WP_DEFAULT_THEME != $template ) {
+    if ( WP_DEFAULT_THEME !== $template ) {
         $allowed_themes[ WP_DEFAULT_THEME ] = true;
     }