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

Timestamp:

05/16/2020 06:40:52 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Use strict comparison where static strings are involved.

This reduces the number of WordPress.PHP.StrictComparisons.LooseComparison issues in half, from 1897 to 890.

Includes minor code layout fixes for better readability.

See #49542.

File:

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

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

@@ -945 +945 @@
 
     $activate_url = esc_url( $activate_url );
-    $admin_email  = get_site_option( 'admin_email' );
-    if ( '' == $admin_email ) {
+
+    $admin_email = get_site_option( 'admin_email' );
+
+    if ( '' === $admin_email ) {
         $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
     }
-    $from_name       = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
+
+    $from_name       = ( '' !== get_site_option( 'site_name' ) ) ? esc_html( get_site_option( 'site_name' ) ) : 'WordPress';
     $message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . 'Content-Type: text/plain; charset="' . get_option( 'blog_charset' ) . "\"\n";
 
@@ -1071 +1074 @@
     // Send email with activation link.
     $admin_email = get_site_option( 'admin_email' );
-    if ( '' == $admin_email ) {
+
+    if ( '' === $admin_email ) {
         $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
     }
-    $from_name       = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
+
+    $from_name       = ( '' !== get_site_option( 'site_name' ) ) ? esc_html( get_site_option( 'site_name' ) ) : 'WordPress';
     $message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . 'Content-Type: text/plain; charset="' . get_option( 'blog_charset' ) . "\"\n";
     $message         = sprintf(
@@ -1225 +1230 @@
          * Let's just set the active flag and instruct the user to reset their password.
          */
-        if ( 'blog_taken' == $blog_id->get_error_code() ) {
+        if ( 'blog_taken' === $blog_id->get_error_code() ) {
             $blog_id->add_data( $signup );
             $wpdb->update(
@@ -1399 +1404 @@
     }
 
-    if ( get_site_option( 'registrationnotification' ) != 'yes' ) {
+    if ( 'yes' !== get_site_option( 'registrationnotification' ) ) {
         return false;
     }
 
     $email = get_site_option( 'admin_email' );
+
     if ( is_email( $email ) == false ) {
         return false;
@@ -1459 +1465 @@
  */
 function newuser_notify_siteadmin( $user_id ) {
-    if ( get_site_option( 'registrationnotification' ) != 'yes' ) {
+    if ( 'yes' !== get_site_option( 'registrationnotification' ) ) {
         return false;
     }
@@ -1633 +1639 @@
      */
     $welcome_email = apply_filters( 'update_welcome_email', $welcome_email, $blog_id, $user_id, $password, $title, $meta );
-    $admin_email   = get_site_option( 'admin_email' );
-
-    if ( '' == $admin_email ) {
+
+    $admin_email = get_site_option( 'admin_email' );
+
+    if ( '' === $admin_email ) {
         $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
     }
 
-    $from_name       = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
+    $from_name       = ( '' !== get_site_option( 'site_name' ) ) ? esc_html( get_site_option( 'site_name' ) ) : 'WordPress';
     $message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . 'Content-Type: text/plain; charset="' . get_option( 'blog_charset' ) . "\"\n";
     $message         = $welcome_email;
@@ -1727 +1734 @@
     $admin_email = get_site_option( 'admin_email' );
 
-    if ( '' == $admin_email ) {
+    if ( '' === $admin_email ) {
         $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
     }
 
-    $from_name       = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
+    $from_name       = ( '' !== get_site_option( 'site_name' ) ) ? esc_html( get_site_option( 'site_name' ) ) : 'WordPress';
     $message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . 'Content-Type: text/plain; charset="' . get_option( 'blog_charset' ) . "\"\n";
     $message         = $welcome_email;
@@ -1850 +1857 @@
     foreach ( $site_exts as $ext ) {
         foreach ( $mimes as $ext_pattern => $mime ) {
-            if ( '' != $ext && false !== strpos( $ext_pattern, $ext ) ) {
+            if ( '' !== $ext && false !== strpos( $ext_pattern, $ext ) ) {
                 $site_mimes[ $ext_pattern ] = $mime;
             }
@@ -2120 +2127 @@
     $key   = array_pop( $parts );
 
-    if ( '' == $key ) {
+    if ( '' === $key ) {
         $key = array_pop( $parts );
     }
@@ -2310 +2317 @@
     static $forced_content = false;
 
-    if ( '' != $force ) {
+    if ( ! $force ) {
         $old_forced     = $forced_content;
         $forced_content = $force;
@@ -2595 +2602 @@
     }
 
-    if ( 'users' == $using ) {
+    if ( 'users' === $using ) {
         $count = get_user_count( $network_id );
         /**
@@ -2612 +2619 @@
 
     $count = get_blog_count( $network_id );
+
     /** This filter is documented in wp-includes/ms-functions.php */
     return apply_filters( 'wp_is_large_network', $count > 10000, 'sites', $count, $network_id );