WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Coding Standards: Use strict comparison in `wp-admin/includes/ms.php`. 

Props davidbaumwald, audrasjb.
Fixes #47422.
Built from https://develop.svn.wordpress.org/trunk@52086


git-svn-id: http://core.svn.wordpress.org/trunk@51678 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2021-11-09 23:06:01 +00:00
parent 9d4d3f8fba
commit 878c7c0486
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
wp-admin/includes/ms.php
View File

@ -20,7 +20,7 @@ function check_upload_size( $file ) {
return $file; return $file;
} }
if ( '0' != $file['error'] ) { // There's already an error. if ( $file['error'] > 0 ) { // There's already an error.
return $file; return $file;
} }
@ -45,7 +45,7 @@ function check_upload_size( $file ) {
$file['error'] = __( 'You have used your space quota. Please delete files before uploading.' ); $file['error'] = __( 'You have used your space quota. Please delete files before uploading.' );
} }
if ( '0' != $file['error'] && ! isset( $_POST['html-upload'] ) && ! wp_doing_ajax() ) { if ( $file['error'] > 0 && ! isset( $_POST['html-upload'] ) && ! wp_doing_ajax() ) {
wp_die( $file['error'] . ' <a href="javascript:history.go(-1)">' . __( 'Back' ) . '</a>' ); wp_die( $file['error'] . ' <a href="javascript:history.go(-1)">' . __( 'Back' ) . '</a>' );
} }
@ -66,8 +66,10 @@ function check_upload_size( $file ) {
function wpmu_delete_blog( $blog_id, $drop = false ) { function wpmu_delete_blog( $blog_id, $drop = false ) {
global $wpdb; global $wpdb;
$blog_id = (int) $blog_id;
$switch = false; $switch = false;
if ( get_current_blog_id() != $blog_id ) { if ( get_current_blog_id() !== $blog_id ) {
$switch = true; $switch = true;
switch_to_blog( $blog_id ); switch_to_blog( $blog_id );
} }
@ -82,7 +84,10 @@ function wpmu_delete_blog( $blog_id, $drop = false ) {
} }
// Don't destroy the initial, main, or root blog. // Don't destroy the initial, main, or root blog.
if ( $drop && ( 1 == $blog_id || is_main_site( $blog_id ) || ( $blog->path == $current_network->path && $blog->domain == $current_network->domain ) ) ) { if ( $drop
&& ( 1 === $blog_id || is_main_site( $blog_id )
|| ( $blog->path === $current_network->path && $blog->domain === $current_network->domain ) )
) {
$drop = false; $drop = false;
} }
@ -702,7 +707,7 @@ function site_admin_notice() {
return; return;
} }
if ( get_site_option( 'wpmu_upgrade_site' ) != $wp_db_version ) { if ( (int) get_site_option( 'wpmu_upgrade_site' ) !== $wp_db_version ) {
echo "<div class='update-nag notice notice-warning inline'>" . sprintf( echo "<div class='update-nag notice notice-warning inline'>" . sprintf(
/* translators: %s: URL to Upgrade Network screen. */ /* translators: %s: URL to Upgrade Network screen. */
__( 'Thank you for Updating! Please visit the <a href="%s">Upgrade Network</a> page to update all your sites.' ), __( 'Thank you for Updating! Please visit the <a href="%s">Upgrade Network</a> page to update all your sites.' ),
@ -742,13 +747,16 @@ function avoid_blog_page_permalink_collision( $data, $postarr ) {
$post_name = $data['post_name']; $post_name = $data['post_name'];
$c = 0; $c = 0;
while ( $c < 10 && get_id_from_blogname( $post_name ) ) { while ( $c < 10 && get_id_from_blogname( $post_name ) ) {
$post_name .= mt_rand( 1, 10 ); $post_name .= mt_rand( 1, 10 );
$c ++; $c++;
} }
if ( $post_name != $data['post_name'] ) {
if ( $post_name !== $data['post_name'] ) {
$data['post_name'] = $post_name; $data['post_name'] = $post_name;
} }
return $data; return $data;
} }
@ -769,14 +777,14 @@ function choose_primary_blog() {
<td> <td>
<?php <?php
$all_blogs = get_blogs_of_user( get_current_user_id() ); $all_blogs = get_blogs_of_user( get_current_user_id() );
$primary_blog = get_user_meta( get_current_user_id(), 'primary_blog', true ); $primary_blog = (int) get_user_meta( get_current_user_id(), 'primary_blog', true );
if ( count( $all_blogs ) > 1 ) { if ( count( $all_blogs ) > 1 ) {
$found = false; $found = false;
?> ?>
<select name="primary_blog" id="primary_blog"> <select name="primary_blog" id="primary_blog">
<?php <?php
foreach ( (array) $all_blogs as $blog ) { foreach ( (array) $all_blogs as $blog ) {
if ( $primary_blog == $blog->userblog_id ) { if ( $blog->userblog_id === $primary_blog ) {
$found = true; $found = true;
} }
?> ?>
@ -790,10 +798,10 @@ function choose_primary_blog() {
$blog = reset( $all_blogs ); $blog = reset( $all_blogs );
update_user_meta( get_current_user_id(), 'primary_blog', $blog->userblog_id ); update_user_meta( get_current_user_id(), 'primary_blog', $blog->userblog_id );
} }
} elseif ( count( $all_blogs ) == 1 ) { } elseif ( 1 === count( $all_blogs ) ) {
$blog = reset( $all_blogs ); $blog = reset( $all_blogs );
echo esc_url( get_home_url( $blog->userblog_id ) ); echo esc_url( get_home_url( $blog->userblog_id ) );
if ( $primary_blog != $blog->userblog_id ) { // Set the primary blog again if it's out of sync with blog list. if ( $blog->userblog_id !== $primary_blog ) { // Set the primary blog again if it's out of sync with blog list.
update_user_meta( get_current_user_id(), 'primary_blog', $blog->userblog_id ); update_user_meta( get_current_user_id(), 'primary_blog', $blog->userblog_id );
} }
} else { } else {
@ -818,7 +826,7 @@ function choose_primary_blog() {
* @return bool True if network can be edited, otherwise false. * @return bool True if network can be edited, otherwise false.
*/ */
function can_edit_network( $network_id ) { function can_edit_network( $network_id ) {
if ( get_current_network_id() == $network_id ) { if ( get_current_network_id() === (int) $network_id ) {
$result = true; $result = true;
} else { } else {
$result = false; $result = false;
@ -878,7 +886,7 @@ function confirm_delete_users( $users ) {
<?php <?php
$allusers = (array) $_POST['allusers']; $allusers = (array) $_POST['allusers'];
foreach ( $allusers as $user_id ) { foreach ( $allusers as $user_id ) {
if ( '' !== $user_id && '0' != $user_id ) { if ( '' !== $user_id && '0' !== $user_id ) {
$delete_user = get_userdata( $user_id ); $delete_user = get_userdata( $user_id );
if ( ! current_user_can( 'delete_user', $delete_user->ID ) ) { if ( ! current_user_can( 'delete_user', $delete_user->ID ) ) {

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.9-alpha-52085'; $wp_version = '5.9-alpha-52086';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.