Changeset 32733

Timestamp:

06/12/2015 05:47:16 PM (9 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.

Location:

trunk

Files:

• src/wp-includes/class-wp-xmlrpc-server.php (modified) (1 diff)
• src/wp-includes/general-template.php (modified) (1 diff)
• src/wp-includes/kses.php (modified) (1 diff)
• src/wp-includes/ms-deprecated.php (modified) (2 diffs)
• src/wp-includes/ms-functions.php (modified) (5 diffs)
• src/wp-includes/pluggable.php (modified) (1 diff)
• src/wp-includes/revision.php (modified) (1 diff)
• src/wp-signup.php (modified) (2 diffs)
• tests/phpunit/tests/customize/setting.php (modified) (1 diff)

trunk/src/wp-includes/class-wp-xmlrpc-server.php

@@ -3255 +3255 @@
         $status = wp_delete_comment( $comment_ID );
 
-        if ( true == $status ) {
+        if ( $status ) {
             /**
              * Fires after a comment has been successfully deleted via XML-RPC.

trunk/src/wp-includes/general-template.php

@@ -1646 +1646 @@
 
     foreach ( $myweek as $wd ) {
-        $day_name = (true == $initial) ? $wp_locale->get_weekday_initial($wd) : $wp_locale->get_weekday_abbrev($wd);
+        $day_name = $initial ? $wp_locale->get_weekday_initial($wd) : $wp_locale->get_weekday_abbrev($wd);
         $wd = esc_attr($wd);
         $calendar_output .= "\n\t\t<th scope=\"col\" title=\"$wd\">$day_name</th>";

trunk/src/wp-includes/kses.php

@@ -1462 +1462 @@
     kses_remove_filters();
 
-    if (current_user_can('unfiltered_html') == false)
+    if ( ! current_user_can( 'unfiltered_html' ) ) {
         kses_init_filters();
+    }
 }
 

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

@@ -211 +211 @@
     }
 
-    if ( $display == true ) {
+    if ( $display ) {
         if ( is_array( $most_active ) ) {
             reset( $most_active );
@@ -254 +254 @@
         exit();
     }
-    if ( empty( $_SERVER['HTTP_REFERER'] ) == false ) {
+    if ( ! empty( $_SERVER['HTTP_REFERER'] ) ) {
         wp_redirect( $_SERVER['HTTP_REFERER'] );
         exit();

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();
 

trunk/src/wp-includes/pluggable.php

@@ -1138 +1138 @@
     $result = wp_verify_nonce( $nonce, $action );
 
-    if ( $die && false == $result ) {
+    if ( $die && false === $result ) {
         if ( defined( 'DOING_AJAX' ) && DOING_AJAX )
             wp_die( -1 );

trunk/src/wp-includes/revision.php

@@ -523 +523 @@
         $id = (int) $_GET['preview_id'];
 
-        if ( false == wp_verify_nonce( $_GET['preview_nonce'], 'post_preview_' . $id ) )
+        if ( false === wp_verify_nonce( $_GET['preview_nonce'], 'post_preview_' . $id ) )
             wp_die( __('You do not have permission to preview drafts.') );
 

trunk/src/wp-signup.php

@@ -8 +8 @@
 require( dirname( __FILE__ ) . '/wp-blog-header.php' );
 
-if ( is_array( get_site_option( 'illegal_names' )) && isset( $_GET[ 'new' ] ) && in_array( $_GET[ 'new' ], get_site_option( 'illegal_names' ) ) == true ) {
+if ( is_array( get_site_option( 'illegal_names' )) && isset( $_GET[ 'new' ] ) && in_array( $_GET[ 'new' ], get_site_option( 'illegal_names' ) ) ) {
     wp_redirect( network_home_url() );
     die();
@@ -701 +701 @@
             if ( is_user_logged_in() && ( $active_signup == 'all' || $active_signup == 'blog' ) )
                 signup_another_blog($newblogname);
-            elseif ( is_user_logged_in() == false && ( $active_signup == 'all' || $active_signup == 'user' ) )
+            elseif ( ! is_user_logged_in() && ( $active_signup == 'all' || $active_signup == 'user' ) )
                 signup_user( $newblogname, $user_email );
-            elseif ( is_user_logged_in() == false && ( $active_signup == 'blog' ) )
+            elseif ( ! is_user_logged_in() && ( $active_signup == 'blog' ) )
                 _e( 'Sorry, new registrations are not allowed at this time.' );
             else

trunk/tests/phpunit/tests/customize/setting.php

@@ -380 +380 @@
         $this->manager->set_post_value( $name, $post_value );
         $setting = new WP_Customize_Setting( $this->manager, $name, compact( 'type' ) );
-        $this->assertNull( $setting->is_current_blog_previewed() );
+        $this->assertFalse( $setting->is_current_blog_previewed() );
         $setting->preview();
         $this->assertTrue( $setting->is_current_blog_previewed() );