Changeset 52086 for trunk/src/wp-admin/includes/ms.php

Timestamp:

11/09/2021 11:04:41 PM (5 years ago)

Author:

SergeyBiryukov

Message:

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

Props davidbaumwald, audrasjb.
Fixes #47422.

File:

• trunk/src/wp-admin/includes/ms.php (modified) (11 diffs)

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

@@ -21 +21 @@
         }
 
-        if ( '0' != $file['error'] ) { // There's already an error.
+        if ( $file['error'] > 0 ) { // There's already an error.
                 return $file;
         }
@@ -46 +46 @@
         }
 
-        if ( '0' != $file['error'] && ! isset( $_POST['html-upload'] ) && ! wp_doing_ajax() ) {
+        if ( $file['error'] > 0 && ! isset( $_POST['html-upload'] ) && ! wp_doing_ajax() ) {
                 wp_die( $file['error'] . ' <a href="javascript:history.go(-1)">' . __( 'Back' ) . '</a>' );
         }
@@ -67 +67 @@
         global $wpdb;
 
+        $blog_id = (int) $blog_id;
+
         $switch = false;
-        if ( get_current_blog_id() != $blog_id ) {
+        if ( get_current_blog_id() !== $blog_id ) {
                 $switch = true;
                 switch_to_blog( $blog_id );
@@ -83 +85 @@
 
         // Don't destroy the initial, main, or root blog.
-        if ( $drop && ( 1 == $blog_id || is_main_site( $blog_id ) || ( $blog->path == $current_network->path && $blog->domain == $current_network->domain ) ) ) {
+        if ( $drop
+                && ( 1 === $blog_id || is_main_site( $blog_id )
+                        || ( $blog->path === $current_network->path && $blog->domain === $current_network->domain ) )
+        ) {
                 $drop = false;
         }
@@ -703 +708 @@
         }
 
-        if ( get_site_option( 'wpmu_upgrade_site' ) != $wp_db_version ) {
+        if ( (int) get_site_option( 'wpmu_upgrade_site' ) !== $wp_db_version ) {
                 echo "<div class='update-nag notice notice-warning inline'>" . sprintf(
                         /* translators: %s: URL to Upgrade Network screen. */
@@ -743 +748 @@
         $post_name = $data['post_name'];
         $c         = 0;
+
         while ( $c < 10 && get_id_from_blogname( $post_name ) ) {
                 $post_name .= mt_rand( 1, 10 );
-                $c ++;
-        }
-        if ( $post_name != $data['post_name'] ) {
+                $c++;
+        }
+
+        if ( $post_name !== $data['post_name'] ) {
                 $data['post_name'] = $post_name;
         }
+
         return $data;
 }
@@ -770 +778 @@
                 <?php
                 $all_blogs    = get_blogs_of_user( get_current_user_id() );
-                $primary_blog = get_user_meta( get_current_user_id(), 'primary_blog', true );
+                $primary_blog = (int) get_user_meta( get_current_user_id(), 'primary_blog', true );
                 if ( count( $all_blogs ) > 1 ) {
                         $found = false;
@@ -777 +785 @@
                                 <?php
                                 foreach ( (array) $all_blogs as $blog ) {
-                                        if ( $primary_blog == $blog->userblog_id ) {
+                                        if ( $blog->userblog_id === $primary_blog ) {
                                                 $found = true;
                                         }
@@ -791 +799 @@
                                 update_user_meta( get_current_user_id(), 'primary_blog', $blog->userblog_id );
                         }
-                } elseif ( count( $all_blogs ) == 1 ) {
+                } elseif ( 1 === count( $all_blogs ) ) {
                         $blog = reset( $all_blogs );
                         echo esc_url( get_home_url( $blog->userblog_id ) );
-                        if ( $primary_blog != $blog->userblog_id ) { // Set the primary blog again if it's out of sync with blog list.
+                        if ( $blog->userblog_id !== $primary_blog ) { // Set the primary blog again if it's out of sync with blog list.
                                 update_user_meta( get_current_user_id(), 'primary_blog', $blog->userblog_id );
                         }
@@ -819 +827 @@
  */
 function can_edit_network( $network_id ) {
-        if ( get_current_network_id() == $network_id ) {
+        if ( get_current_network_id() === (int) $network_id ) {
                 $result = true;
         } else {
@@ -879 +887 @@
         $allusers = (array) $_POST['allusers'];
         foreach ( $allusers as $user_id ) {
-                if ( '' !== $user_id && '0' != $user_id ) {
+                if ( '' !== $user_id && '0' !== $user_id ) {
                         $delete_user = get_userdata( $user_id );