diff -r be944660c56a -r 3d72ae0968f4 wp/wp-admin/includes/ms.php --- a/wp/wp-admin/includes/ms.php Wed Sep 21 18:19:35 2022 +0200 +++ b/wp/wp-admin/includes/ms.php Tue Sep 27 16:37:53 2022 +0200 @@ -12,15 +12,15 @@ * * @since 3.0.0 * - * @param array $file $_FILES array for a given file. - * @return array $_FILES array with 'error' key set if file exceeds quota. 'error' is empty otherwise. + * @param array $file An element from the `$_FILES` array for a given file. + * @return array The `$_FILES` array element with 'error' key set if file exceeds quota. 'error' is empty otherwise. */ function check_upload_size( $file ) { if ( get_site_option( 'upload_space_check_disabled' ) ) { return $file; } - if ( '0' != $file['error'] ) { // There's already an error. + if ( $file['error'] > 0 ) { // There's already an error. return $file; } @@ -45,7 +45,7 @@ $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'] . ' ' . __( 'Back' ) . '' ); } @@ -66,8 +66,10 @@ function wpmu_delete_blog( $blog_id, $drop = false ) { global $wpdb; + $blog_id = (int) $blog_id; + $switch = false; - if ( get_current_blog_id() != $blog_id ) { + if ( get_current_blog_id() !== $blog_id ) { $switch = true; switch_to_blog( $blog_id ); } @@ -82,7 +84,10 @@ } // 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; } @@ -212,10 +217,11 @@ * * @since MU (3.0.0) * - * @param bool $echo Optional. If $echo is set and the quota is exceeded, a warning message is echoed. Default is true. + * @param bool $display_message Optional. If set to true and the quota is exceeded, + * a warning message is displayed. Default true. * @return bool True if user is over upload space quota, otherwise false. */ -function upload_is_user_over_quota( $echo = true ) { +function upload_is_user_over_quota( $display_message = true ) { if ( get_site_option( 'upload_space_check_disabled' ) ) { return false; } @@ -227,7 +233,7 @@ $space_used = get_space_used(); if ( ( $space_allowed - $space_used ) < 0 ) { - if ( $echo ) { + if ( $display_message ) { printf( /* translators: %s: Allowed space allocation. */ __( 'Sorry, you have used your space allocation of %s. Please delete some files to upload more files.' ), @@ -687,7 +693,7 @@ * @since 3.0.0 * * @global int $wp_db_version WordPress database version. - * @global string $pagenow + * @global string $pagenow The filename of the current screen. * * @return void|false Void on success. False if the current user is not a super admin. */ @@ -702,7 +708,7 @@ return; } - if ( get_site_option( 'wpmu_upgrade_site' ) != $wp_db_version ) { + if ( (int) get_site_option( 'wpmu_upgrade_site' ) !== $wp_db_version ) { echo "