Changeset 59573

Timestamp:

01/03/2025 10:55:42 PM (5 months ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Use strict comparison in wpmu_validate_blog_signup().

Follow-up to ​mu:8, ​mu:543, ​mu:550, ​mu:1364, ​mu:1958, [12603], [32733].

Props debarghyabanerjee, aristath, poena, afercia, SergeyBiryukov.
See #62279, #62283.

File:

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

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

@@ -482 +482 @@
 
     $illegal_names = get_site_option( 'illegal_names' );
+
     if ( ! is_array( $illegal_names ) ) {
         $illegal_names = array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' );
         add_site_option( 'illegal_names', $illegal_names );
     }
+
     if ( in_array( $user_name, $illegal_names, true ) ) {
         $errors->add( 'user_name', __( 'Sorry, that username is not allowed.' ) );
@@ -517 +519 @@
 
     $limited_email_domains = get_site_option( 'limited_email_domains' );
+
     if ( is_array( $limited_email_domains ) && ! empty( $limited_email_domains ) ) {
         $limited_email_domains = array_map( 'strtolower', $limited_email_domains );
-        $emaildomain           = strtolower( substr( $user_email, 1 + strpos( $user_email, '@' ) ) );
-        if ( ! in_array( $emaildomain, $limited_email_domains, true ) ) {
+        $email_domain          = strtolower( substr( $user_email, 1 + strpos( $user_email, '@' ) ) );
+
+        if ( ! in_array( $email_domain, $limited_email_domains, true ) ) {
             $errors->add( 'user_email', __( 'Sorry, that email address is not allowed!' ) );
         }
@@ -638 +642 @@
     $errors        = new WP_Error();
     $illegal_names = get_site_option( 'illegal_names' );
-    if ( false == $illegal_names ) {
+
+    if ( ! is_array( $illegal_names ) ) {
         $illegal_names = array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' );
         add_site_option( 'illegal_names', $illegal_names );
@@ -722 +727 @@
      */
     if ( username_exists( $blogname ) ) {
-        if ( ! is_object( $user ) || ( is_object( $user ) && ( $user->user_login != $blogname ) ) ) {
+        if ( ! is_object( $user ) || ( is_object( $user ) && ( $user->user_login !== $blogname ) ) ) {
             $errors->add( 'blogname', __( 'Sorry, that site is reserved!' ) );
         }