Changeset 47219 for trunk/src/wp-includes/ms-functions.php

Timestamp:

02/09/2020 04:52:28 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Use Yoda conditions where appropriate.

See #49222.

File:

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

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

@@ -72 +72 @@
     }
 
-    if ( ( ! is_object( $primary ) ) || ( $primary->archived == 1 || $primary->spam == 1 || $primary->deleted == 1 ) ) {
+    if ( ( ! is_object( $primary ) ) || ( 1 == $primary->archived || 1 == $primary->spam || 1 == $primary->deleted ) ) {
         $blogs = get_blogs_of_user( $user_id, true ); // If a user's primary blog is shut down, check their other blogs.
         $ret   = false;
         if ( is_array( $blogs ) && count( $blogs ) > 0 ) {
             foreach ( (array) $blogs as $blog_id => $blog ) {
-                if ( $blog->site_id != get_current_network_id() ) {
+                if ( get_current_network_id() != $blog->site_id ) {
                     continue;
                 }
                 $details = get_site( $blog_id );
-                if ( is_object( $details ) && $details->archived == 0 && $details->spam == 0 && $details->deleted == 0 ) {
+                if ( is_object( $details ) && 0 == $details->archived && 0 == $details->spam && 0 == $details->deleted ) {
                     $ret = $details;
                     if ( get_user_meta( $user_id, 'primary_blog', true ) != $blog_id ) {
@@ -352 +352 @@
     $id     = wp_cache_get( md5( $domain . $path ), 'blog-id-cache' );
 
-    if ( $id == -1 ) { // Blog does not exist.
+    if ( -1 == $id ) { // Blog does not exist.
         return 0;
     } elseif ( $id ) {
@@ -420 +420 @@
 
             $dotted_domain = ".$banned_domain";
-            if ( $dotted_domain === substr( $normalized_email, -strlen( $dotted_domain ) ) ) {
+            if ( substr( $normalized_email, -strlen( $dotted_domain ) ) === $dotted_domain ) {
                 $is_email_address_unsafe = true;
                 break;
@@ -540 +540 @@
     // 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 ( $signup != null ) {
+    if ( null != $signup ) {
         $registered_at = mysql2date( 'U', $signup->registered );
         $now           = time();
@@ -553 +553 @@
 
     $signup = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->signups WHERE user_email = %s", $user_email ) );
-    if ( $signup != null ) {
+    if ( null != $signup ) {
         $diff = time() - mysql2date( 'U', $signup->registered );
         // If registered more than two days ago, cancel registration and let this signup go through.
@@ -633 +633 @@
     $errors        = new WP_Error();
     $illegal_names = get_site_option( 'illegal_names' );
-    if ( $illegal_names == false ) {
+    if ( false == $illegal_names ) {
         $illegal_names = array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' );
         add_site_option( 'illegal_names', $illegal_names );
@@ -946 +946 @@
     $activate_url = esc_url( $activate_url );
     $admin_email  = get_site_option( 'admin_email' );
-    if ( $admin_email == '' ) {
+    if ( '' == $admin_email ) {
         $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
     }
@@ -1071 +1071 @@
     // Send email with activation link.
     $admin_email = get_site_option( 'admin_email' );
-    if ( $admin_email == '' ) {
+    if ( '' == $admin_email ) {
         $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
     }
@@ -1590 +1590 @@
 
     $welcome_email = get_site_option( 'welcome_email' );
-    if ( $welcome_email == false ) {
+    if ( false == $welcome_email ) {
         /* translators: Do not translate USERNAME, SITE_NAME, BLOG_URL, PASSWORD: those are placeholders. */
         $welcome_email = __(
@@ -1635 +1635 @@
     $admin_email   = get_site_option( 'admin_email' );
 
-    if ( $admin_email == '' ) {
+    if ( '' == $admin_email ) {
         $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
     }
@@ -1727 +1727 @@
     $admin_email = get_site_option( 'admin_email' );
 
-    if ( $admin_email == '' ) {
+    if ( '' == $admin_email ) {
         $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
     }
@@ -1850 +1850 @@
     foreach ( $site_exts as $ext ) {
         foreach ( $mimes as $ext_pattern => $mime ) {
-            if ( $ext != '' && strpos( $ext_pattern, $ext ) !== false ) {
+            if ( '' != $ext && false !== strpos( $ext_pattern, $ext ) ) {
                 $site_mimes[ $ext_pattern ] = $mime;
             }
@@ -1937 +1937 @@
     // Prevent a race condition.
     $recurse_start = false;
-    if ( $global_terms_recurse === null ) {
+    if ( null === $global_terms_recurse ) {
         $recurse_start        = true;
         $global_terms_recurse = 1;
@@ -1948 +1948 @@
 
     $global_id = $wpdb->get_var( $wpdb->prepare( "SELECT cat_ID FROM $wpdb->sitecategories WHERE category_nicename = %s", $c->slug ) );
-    if ( $global_id == null ) {
+    if ( null == $global_id ) {
         $used_global_id = $wpdb->get_var( $wpdb->prepare( "SELECT cat_ID FROM $wpdb->sitecategories WHERE cat_ID = %d", $c->term_id ) );
         if ( null == $used_global_id ) {
@@ -2094 +2094 @@
         $destination = apply_filters( 'blog_redirect_404', NOBLOGREDIRECT );
         if ( $destination ) {
-            if ( $destination == '%siteurl%' ) {
+            if ( '%siteurl%' === $destination ) {
                 $destination = network_home_url();
             }
@@ -2120 +2120 @@
     $key   = array_pop( $parts );
 
-    if ( $key == '' ) {
+    if ( '' == $key ) {
         $key = array_pop( $parts );
     }
@@ -2262 +2262 @@
 function users_can_register_signup_filter() {
     $registration = get_site_option( 'registration' );
-    return ( $registration == 'all' || $registration == 'user' );
+    return ( 'all' === $registration || 'user' === $registration );
 }
 
@@ -2660 +2660 @@
  */
 function update_network_option_new_admin_email( $old_value, $value ) {
-    if ( $value == get_site_option( 'admin_email' ) || ! is_email( $value ) ) {
+    if ( get_site_option( 'admin_email' ) === $value || ! is_email( $value ) ) {
         return;
     }