From e499354eee0bdc21440bd4af2506a45c8192f089 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sun, 16 Aug 2020 17:52:25 +0000 Subject: [PATCH] Site Health: Rename the `$upload_max_size` variable to `$upload_max_filesize`, for consistency with the PHP setting name. Follow-up to [48535], [48538], [48539], [48544], [48800]. See #50945. git-svn-id: https://develop.svn.wordpress.org/trunk@48801 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/includes/class-wp-debug-data.php | 16 ++++++++-------- src/wp-admin/includes/class-wp-site-health.php | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/wp-admin/includes/class-wp-debug-data.php b/src/wp-admin/includes/class-wp-debug-data.php index 503dc7bfe8..96f84ef136 100644 --- a/src/wp-admin/includes/class-wp-debug-data.php +++ b/src/wp-admin/includes/class-wp-debug-data.php @@ -531,10 +531,10 @@ class WP_Debug_Data { ); } else { // Get the PHP ini directive values. - $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( wp_convert_hr_to_bytes( $post_max_size ), wp_convert_hr_to_bytes( $upload_max_size ) ); + $post_max_size = ini_get( 'post_max_size' ); + $upload_max_filesize = ini_get( 'upload_max_filesize' ); + $max_file_uploads = ini_get( 'max_file_uploads' ); + $effective = min( wp_convert_hr_to_bytes( $post_max_size ), wp_convert_hr_to_bytes( $upload_max_filesize ) ); // Add info in Media section. $info['wp-media']['fields']['file_uploads'] = array( @@ -548,7 +548,7 @@ class WP_Debug_Data { ); $info['wp-media']['fields']['upload_max_filesize'] = array( 'label' => __( 'Max size of an uploaded file' ), - 'value' => $upload_max_size, + 'value' => $upload_max_filesize, ); $info['wp-media']['fields']['max_effective_size'] = array( 'label' => __( 'Max effective file size' ), @@ -711,15 +711,15 @@ class WP_Debug_Data { ); } - $info['wp-server']['fields']['max_input_time'] = array( + $info['wp-server']['fields']['max_input_time'] = array( 'label' => __( 'Max input time' ), 'value' => ini_get( 'max_input_time' ), ); - $info['wp-server']['fields']['upload_max_size'] = array( + $info['wp-server']['fields']['upload_max_filesize'] = array( 'label' => __( 'Upload max filesize' ), 'value' => ini_get( 'upload_max_filesize' ), ); - $info['wp-server']['fields']['php_post_max_size'] = array( + $info['wp-server']['fields']['php_post_max_size'] = array( 'label' => __( 'PHP post max size' ), 'value' => ini_get( 'post_max_size' ), ); diff --git a/src/wp-admin/includes/class-wp-site-health.php b/src/wp-admin/includes/class-wp-site-health.php index 94bc35b834..dd58d93b4e 100644 --- a/src/wp-admin/includes/class-wp-site-health.php +++ b/src/wp-admin/includes/class-wp-site-health.php @@ -2046,10 +2046,10 @@ class WP_Site_Health { return $result; } - $post_max_size = ini_get( 'post_max_size' ); - $upload_max_size = ini_get( 'upload_max_filesize' ); + $post_max_size = ini_get( 'post_max_size' ); + $upload_max_filesize = ini_get( 'upload_max_filesize' ); - if ( wp_convert_hr_to_bytes( $post_max_size ) < wp_convert_hr_to_bytes( $upload_max_size ) ) { + if ( wp_convert_hr_to_bytes( $post_max_size ) < wp_convert_hr_to_bytes( $upload_max_filesize ) ) { $result['label'] = sprintf( /* translators: 1: post_max_size, 2: upload_max_filesize */ __( 'The "%1$s" value is smaller than "%2$s".' ),