From 0d956d40136f56258dc8d3d782f41ea158aaf4fa Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Tue, 21 Jul 2020 15:38:40 +0000
Subject: [PATCH] Site Health: Remove `parse_ini_size()`, use the existing
 `wp_convert_hr_to_bytes()` function instead.

Follow-up to [48535].

See #50038.

git-svn-id: https://develop.svn.wordpress.org/trunk@48538 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/class-wp-debug-data.php |  2 +-
 .../includes/class-wp-site-health.php         |  7 ++--
 src/wp-includes/functions.php                 | 32 -------------------
 3 files changed, 6 insertions(+), 35 deletions(-)

diff --git a/src/wp-admin/includes/class-wp-debug-data.php b/src/wp-admin/includes/class-wp-debug-data.php
index e26e2ed5d2..0649562edf 100644
--- a/src/wp-admin/includes/class-wp-debug-data.php
+++ b/src/wp-admin/includes/class-wp-debug-data.php
@@ -534,7 +534,7 @@ class WP_Debug_Data {
 			$post_max_size    = ini_get( 'post_max_size' );
 			$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.
 			$info['wp-media']['fields']['file_uploads']        = array(
diff --git a/src/wp-admin/includes/class-wp-site-health.php b/src/wp-admin/includes/class-wp-site-health.php
index f3f1898de1..7e55ec515d 100644
--- a/src/wp-admin/includes/class-wp-site-health.php
+++ b/src/wp-admin/includes/class-wp-site-health.php
@@ -1956,7 +1956,7 @@ class WP_Site_Health {
 	}
 
 	/**
-	 * 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
 	 *
@@ -2007,7 +2007,10 @@ class WP_Site_Health {
 			return $result;
 		}
 
-		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';
 			$result['description'] = sprintf(
diff --git a/src/wp-includes/functions.php b/src/wp-includes/functions.php
index 4b58181259..3c0937ed32 100644
--- a/src/wp-includes/functions.php
+++ b/src/wp-includes/functions.php
@@ -476,38 +476,6 @@ function size_format( $bytes, $decimals = 0 ) {
 	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;
-	}
-}
-
 /**
  * Convert a duration to human readable format.
  *