Changeset 48801

Timestamp:

08/16/2020 05:52:25 PM (4 years ago)

Author:

SergeyBiryukov

Message:

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.

Location:

trunk/src/wp-admin/includes

Files:

• class-wp-debug-data.php (modified) (3 diffs)
• class-wp-site-health.php (modified) (1 diff)

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

@@ -532 +532 @@
         } 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.
@@ -549 +549 @@
             $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(
@@ -712 +712 @@
             }
 
-            $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' ),

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

@@ -2047 +2047 @@
         }
 
-        $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 ) ) {
+        $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_filesize ) ) {
             $result['label'] = sprintf(
                 /* translators: 1: post_max_size, 2: upload_max_filesize */