Changeset 48538

Timestamp:

07/21/2020 03:38:40 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Site Health: Remove parse_ini_size(), use the existing wp_convert_hr_to_bytes() function instead.

Follow-up to [48535].

See #50038.

Location:

trunk/src

Files:

• wp-admin/includes/class-wp-debug-data.php (modified) (1 diff)
• wp-admin/includes/class-wp-site-health.php (modified) (2 diffs)
• wp-includes/functions.php (modified) (1 diff)

trunk/src/wp-admin/includes/class-wp-debug-data.php

@@ -535 +535 @@
             $upload_max_size  = ini_get( 'upload_max_filesize' );
             $max_file_uploads = ini_get( 'max_file_uploads' );
-            $effective        = min( parse_ini_size( $post_max_size ), parse_ini_size( $upload_max_size ) );
+            $effective        = min( wp_convert_hr_to_bytes( $post_max_size ), wp_convert_hr_to_bytes( $upload_max_size ) );
 
             // Add info in Media section.

trunk/src/wp-admin/includes/class-wp-site-health.php

@@ -1957 +1957 @@
 
     /**
-     * Test if 'file_uploads' directive in PHP.ini is turned off
+     * Test if 'file_uploads' directive in PHP.ini is turned off.
      *
      * @since 5.5.0
@@ -2008 +2008 @@
         }
 
-        if ( parse_ini_size( ini_get( 'post_max_size' ) ) !== parse_ini_size( ini_get( 'upload_max_filesize' ) ) ) {
+        $post_max_size   = ini_get( 'post_max_size' );
+        $upload_max_size = ini_get( 'upload_max_filesize' );
+
+        if ( wp_convert_hr_to_bytes( $post_max_size ) !== wp_convert_hr_to_bytes( $upload_max_size ) ) {
             $result['label']       = __( 'Mismatched "post_max_size" and "upload_max_filesize" values.' );
             $result['status']      = 'recommended';

trunk/src/wp-includes/functions.php

@@ -475 +475 @@
 
     return false;
-}
-
-/**
- * Converts a shorthand byte string to bytes.
- *
- * Useful when needing to compare two byte strings for size differences.
- *
- * E.g.
- *  "1G" (1 Gigabyte) = 1073741824
- *  "10M" (10 Megabytes) = 10485760
- *  "1K" (1 Kilobyte) = 1024
- *
- * @since 5.5.0
- *
- * @param  string $size_string Shorthand byte string
- * @return int                 $size_string converted to numberic bytes.
- */
-function parse_ini_size( $size_string ) {
-    $size_string = trim( $size_string );
-    $last        = strtolower( substr( $size_string, - 1 ) );
-    $value       = intval( $size_string );
-
-    switch ( $last ) {
-        case 'g':
-            return (int) $value * GB_IN_BYTES;
-        case 'm':
-            return (int) $value * MB_IN_BYTES;
-        case 'k':
-            return (int) $value * KB_IN_BYTES;
-        default:
-            return (int) $value;
-    }
 }