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

Timestamp:

06/12/2015 05:47:16 PM (8 years ago)

Author:

wonderboymusic

Message:

$status shouldn't be loosely compared to true in wp_xmlrpc_server::wp_deleteComment().
$initial shouldn't be loosely compared to true in get_calendar().
current_user_can() shouldn't be loosely compared to false in kses_init()
$get_all shouldn't be loosely compared to true in get_blog_details().
is_array() and in_array() shouldn't be loosely compared in wpmu_validate_user_signup().
$result should by strictly compared in check_ajax_referer().
wp_verify_nonce() should by strictly compared in _show_post_preview().
is_user_logged_in() should not be loosly compared against false in wp-signup.php.

See #32444.

File:

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

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

@@ -482 +482 @@
 
     $illegal_names = get_site_option( 'illegal_names' );
-    if ( is_array( $illegal_names ) == false ) {
+    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 )
+    if ( in_array( $user_name, $illegal_names ) )
         $errors->add('user_name',  __( 'That username is not allowed.' ) );
 
@@ -506 +506 @@
 
     $limited_email_domains = get_site_option( 'limited_email_domains' );
-    if ( is_array( $limited_email_domains ) && empty( $limited_email_domains ) == false ) {
+    if ( is_array( $limited_email_domains ) && ! empty( $limited_email_domains ) ) {
         $emaildomain = substr( $user_email, 1 + strpos( $user_email, '@' ) );
-        if ( in_array( $emaildomain, $limited_email_domains ) == false )
+        if ( ! in_array( $emaildomain, $limited_email_domains ) ) {
             $errors->add('user_email', __('Sorry, that email address is not allowed!'));
+        }
     }
 
@@ -628 +629 @@
         $errors->add('blogname', __( 'Only lowercase letters (a-z) and numbers are allowed.' ) );
 
-    if ( in_array( $blogname, $illegal_names ) == true )
+    if ( in_array( $blogname, $illegal_names ) )
         $errors->add('blogname',  __( 'That name is not allowed.' ) );
 
@@ -674 +675 @@
 
     if ( username_exists( $blogname ) ) {
-        if ( is_object( $user ) == false || ( 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!' ) );
     }
@@ -1690 +1691 @@
         return $dirsize[ $directory ][ 'size' ];
 
-    if ( false == is_array( $dirsize ) )
+    if ( ! is_array( $dirsize ) )
         $dirsize = array();