Changeset 56428 for branches/6.3/src/wp-admin/includes/class-wp-site-health.php

Timestamp:

08/23/2023 01:29:51 PM (14 months ago)

Author:

audrasjb

Message:

Site Health: Correct the check for disk space available to safely perform updates.

If the available disk space exceeds the PHP_INT_MAX value, i.e. a 32-bit PHP version is in use with more than 2 GB free, the type casting to (int) could cause
an overflow, and the Site Health test would then erroneously report that there is not enough free space.

This commit removes the unnecessary type casting and uses the result from disk_free_space() directly.

Includes optimizing the logic to skip further checks if the available disk space could not be determined.

Follow-up to [55720].

Props mathsgrinds, Presskopp, rajinsharwar, SergeyBiryukov.
Reviewed by azaozz, audrasjb.
Merges [56401] to the 6.3 branch.
Fixes #59116.

Location:

branches/6.3

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/class-wp-site-health.php (modified) (2 diffs)

branches/6.3/src/wp-admin/includes/class-wp-site-health.php

@@ -1944 +1944 @@
         $available_space = function_exists( 'disk_free_space' ) ? @disk_free_space( WP_CONTENT_DIR . '/upgrade/' ) : false;
 
-        $available_space = false !== $available_space
-            ? (int) $available_space
-            : 0;
-
         $result = array(
             'label'       => __( 'Disk space available to safely perform updates' ),
@@ -1964 +1960 @@
         );
 
-        if ( $available_space < 100 * MB_IN_BYTES ) {
-            $result['description'] = __( 'Available disk space is low, less than 100 MB available.' );
+        if ( false === $available_space ) {
+            $result['description'] = __( 'Could not determine available disk space for updates.' );
             $result['status']      = 'recommended';
-        }
-
-        if ( $available_space < 20 * MB_IN_BYTES ) {
+        } elseif ( $available_space < 20 * MB_IN_BYTES ) {
             $result['description'] = __( 'Available disk space is critically low, less than 20 MB available. Proceed with caution, updates may fail.' );
             $result['status']      = 'critical';
-        }
-
-        if ( ! $available_space ) {
-            $result['description'] = __( 'Could not determine available disk space for updates.' );
+        } elseif ( $available_space < 100 * MB_IN_BYTES ) {
+            $result['description'] = __( 'Available disk space is low, less than 100 MB available.' );
             $result['status']      = 'recommended';
         }