WordPress.org

Make WordPress Core

Changeset 48806


Ignore:
Timestamp:
08/17/2020 01:27:29 AM (3 months 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:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/5.5

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

    r48805 r48806  
    538538        } else {
    539539            // Get the PHP ini directive values.
    540             $post_max_size    = ini_get( 'post_max_size' );
    541             $upload_max_size = ini_get( 'upload_max_filesize' );
    542             $max_file_uploads = ini_get( 'max_file_uploads' );
    543             $effective        = min( wp_convert_hr_to_bytes( $post_max_size ), wp_convert_hr_to_bytes( $upload_max_size ) );
     540            $post_max_size       = ini_get( 'post_max_size' );
     541            $upload_max_filesize = ini_get( 'upload_max_filesize' );
     542            $max_file_uploads    = ini_get( 'max_file_uploads' );
     543            $effective           = min( wp_convert_hr_to_bytes( $post_max_size ), wp_convert_hr_to_bytes( $upload_max_filesize ) );
    544544
    545545            // Add info in Media section.
     
    555555            $info['wp-media']['fields']['upload_max_filesize'] = array(
    556556                'label' => __( 'Max size of an uploaded file' ),
    557                 'value' => $upload_max_size,
     557                'value' => $upload_max_filesize,
    558558            );
    559559            $info['wp-media']['fields']['max_effective_size']  = array(
     
    718718            }
    719719
    720             $info['wp-server']['fields']['max_input_time']    = array(
     720            $info['wp-server']['fields']['max_input_time']      = array(
    721721                'label' => __( 'Max input time' ),
    722722                'value' => ini_get( 'max_input_time' ),
    723723            );
    724             $info['wp-server']['fields']['upload_max_size']  = array(
     724            $info['wp-server']['fields']['upload_max_filesize'] = array(
    725725                'label' => __( 'Upload max filesize' ),
    726726                'value' => ini_get( 'upload_max_filesize' ),
    727727            );
    728             $info['wp-server']['fields']['php_post_max_size'] = array(
     728            $info['wp-server']['fields']['php_post_max_size']   = array(
    729729                'label' => __( 'PHP post max size' ),
    730730                'value' => ini_get( 'post_max_size' ),
  • branches/5.5/src/wp-admin/includes/class-wp-site-health.php

    r48756 r48806  
    20472047        }
    20482048
    2049         $post_max_size   = ini_get( 'post_max_size' );
    2050         $upload_max_size = ini_get( 'upload_max_filesize' );
    2051 
    2052         if ( wp_convert_hr_to_bytes( $post_max_size ) !== wp_convert_hr_to_bytes( $upload_max_size ) ) {
     2049        $post_max_size       = ini_get( 'post_max_size' );
     2050        $upload_max_filesize = ini_get( 'upload_max_filesize' );
     2051
     2052        if ( wp_convert_hr_to_bytes( $post_max_size ) < wp_convert_hr_to_bytes( $upload_max_filesize ) ) {
    20532053            $result['label'] = sprintf(
    20542054                /* translators: 1: post_max_size, 2: upload_max_filesize */
    2055                 __( 'Mismatched "%1$s" and "%2$s" values.' ),
     2055                __( 'The "%1$s" value is smaller than "%2$s".' ),
    20562056                'post_max_size',
    20572057                'upload_max_filesize'
     
    20622062                sprintf(
    20632063                    /* translators: 1: post_max_size, 2: upload_max_filesize */
    2064                     __( 'The settings for %1$s and %2$s are not the same, this could cause some problems when trying to upload files.' ),
     2064                    __( 'The setting for %1$s is smaller than %2$s, this could cause some problems when trying to upload files.' ),
    20652065                    '<code>post_max_size</code>',
    20662066                    '<code>upload_max_filesize</code>'
Note: See TracChangeset for help on using the changeset viewer.