Changeset 48806 for branches/5.5

Timestamp:

08/17/2020 01:27:29 AM (4 years ago)

Author:

SergeyBiryukov

Message:

Site Health: Only display the warning about the post_max_size PHP value when it's lower than upload_max_filesize.

Previously, the warning was displayed even if the value was higher than upload_max_filesize, which made the report inaccurate, as these values don't necessarily have to match.

Props oakesjosh, jeroenrotty, desrosj, Clorith.
Merges [48800] and [48801] to the 5.5 branch.
Fixes #50945.

Location:

branches/5.5

Files:

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

branches/5.5/src/wp-admin/includes/class-wp-debug-data.php

@@ -538 +538 @@
         } 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.
@@ -555 +555 @@
             $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(
@@ -718 +718 @@
             }
 
-            $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' ),

branches/5.5/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 */
-                __( 'Mismatched "%1$s" and "%2$s" values.' ),
+                __( 'The "%1$s" value is smaller than "%2$s".' ),
                 'post_max_size',
                 'upload_max_filesize'
@@ -2062 +2062 @@
                 sprintf(
                     /* translators: 1: post_max_size, 2: upload_max_filesize */
-                    __( 'The settings for %1$s and %2$s are not the same, this could cause some problems when trying to upload files.' ),
+                    __( 'The setting for %1$s is smaller than %2$s, this could cause some problems when trying to upload files.' ),
                     '<code>post_max_size</code>',
                     '<code>upload_max_filesize</code>'