From d2a00338f64d82a0ac3b3d3b9ad04b3629f4182e Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Fri, 12 Jun 2015 17:19:27 +0000 Subject: [PATCH] Don't loosely compare functions that return `bool` against a literal `bool`. See #32444. Built from https://develop.svn.wordpress.org/trunk@32730 git-svn-id: http://core.svn.wordpress.org/trunk@32701 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/export.php | 4 ++-- wp-admin/includes/menu.php | 2 +- wp-admin/includes/ms.php | 4 ++-- wp-admin/network/site-new.php | 2 +- wp-admin/network/site-users.php | 2 +- wp-includes/version.php | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/wp-admin/includes/export.php b/wp-admin/includes/export.php index 4ddc210609..68a3942843 100644 --- a/wp-admin/includes/export.php +++ b/wp-admin/includes/export.php @@ -133,9 +133,9 @@ function export_wp( $args = array() ) { * @return string */ function wxr_cdata( $str ) { - if ( seems_utf8( $str ) == false ) + if ( ! seems_utf8( $str ) ) { $str = utf8_encode( $str ); - + } // $str = ent2ncr(esc_html($str)); $str = '', ']]]]>', $str ) . ']]>'; diff --git a/wp-admin/includes/menu.php b/wp-admin/includes/menu.php index f0e6d8662b..accc04b1b0 100644 --- a/wp-admin/includes/menu.php +++ b/wp-admin/includes/menu.php @@ -182,7 +182,7 @@ unset($id, $data, $subs, $first_sub); $separator_found = false; foreach ( $menu as $id => $data ) { if ( 0 == strcmp('wp-menu-separator', $data[4] ) ) { - if (false == $separator_found) { + if ( ! $separator_found ) { $separator_found = true; } else { unset($menu[$id]); diff --git a/wp-admin/includes/ms.php b/wp-admin/includes/ms.php index 38a589cae0..c3b1e7637b 100644 --- a/wp-admin/includes/ms.php +++ b/wp-admin/includes/ms.php @@ -453,9 +453,9 @@ function display_space_usage() { * @return int Max size in bytes */ function fix_import_form_size( $size ) { - if ( upload_is_user_over_quota( false ) == true ) + if ( upload_is_user_over_quota( false ) ) { return 0; - + } $available = get_upload_space_available(); return min( $size, $available ); } diff --git a/wp-admin/network/site-new.php b/wp-admin/network/site-new.php index 2fb59fc859..00ca3c9fc8 100644 --- a/wp-admin/network/site-new.php +++ b/wp-admin/network/site-new.php @@ -76,7 +76,7 @@ if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) { if ( !$user_id ) { // Create a new user with a random password $password = wp_generate_password( 12, false ); $user_id = wpmu_create_user( $domain, $password, $email ); - if ( false == $user_id ) + if ( false === $user_id ) wp_die( __( 'There was an error creating the user.' ) ); else wp_new_user_notification( $user_id, $password ); diff --git a/wp-admin/network/site-users.php b/wp-admin/network/site-users.php index 57a189b7ae..595ca45a5c 100644 --- a/wp-admin/network/site-users.php +++ b/wp-admin/network/site-users.php @@ -70,7 +70,7 @@ if ( $action ) { $password = wp_generate_password( 12, false); $user_id = wpmu_create_user( esc_html( strtolower( $user['username'] ) ), $password, esc_html( $user['email'] ) ); - if ( false == $user_id ) { + if ( false === $user_id ) { $update = 'err_new_dup'; } else { wp_new_user_notification( $user_id, $password ); diff --git a/wp-includes/version.php b/wp-includes/version.php index f9f92668c4..81940a8d91 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.3-alpha-32729'; +$wp_version = '4.3-alpha-32730'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.