sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Site Health: Rename the $upload_max_size variable to $upload_max_filesize, for consistency with the PHP setting name.

Browse Source 
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
This commit is contained in:
Sergey Biryukov 2020-08-16 17:52:25 +00:00
parent 73671e85c5
commit e499354eee
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/wp-admin/includes/class-wp-debug-data.php
View File

@ -531,10 +531,10 @@ class WP_Debug_Data {
); );
} else { } else {
// Get the PHP ini directive values. // Get the PHP ini directive values.
$post_max_size = ini_get( 'post_max_size' ); $post_max_size = ini_get( 'post_max_size' );
$upload_max_size = ini_get( 'upload_max_filesize' ); $upload_max_filesize = ini_get( 'upload_max_filesize' );
$max_file_uploads = ini_get( 'max_file_uploads' ); $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 ) ); $effective = min( wp_convert_hr_to_bytes( $post_max_size ), wp_convert_hr_to_bytes( $upload_max_filesize ) );
// Add info in Media section. // Add info in Media section.
$info['wp-media']['fields']['file_uploads'] = array( $info['wp-media']['fields']['file_uploads'] = array(
@ -548,7 +548,7 @@ class WP_Debug_Data {
); );
$info['wp-media']['fields']['upload_max_filesize'] = array( $info['wp-media']['fields']['upload_max_filesize'] = array(
'label' => __( 'Max size of an uploaded file' ), 'label' => __( 'Max size of an uploaded file' ),
'value' => $upload_max_size, 'value' => $upload_max_filesize,
); );
$info['wp-media']['fields']['max_effective_size'] = array( $info['wp-media']['fields']['max_effective_size'] = array(
'label' => __( 'Max effective file size' ), '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' ), 'label' => __( 'Max input time' ),
'value' => ini_get( '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' ), 'label' => __( 'Upload max filesize' ),
'value' => ini_get( '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' ), 'label' => __( 'PHP post max size' ),
'value' => ini_get( 'post_max_size' ), 'value' => ini_get( 'post_max_size' ),
); );

6
src/wp-admin/includes/class-wp-site-health.php
View File

@ -2046,10 +2046,10 @@ class WP_Site_Health {
return $result; return $result;
} }
$post_max_size = ini_get( 'post_max_size' ); $post_max_size = ini_get( 'post_max_size' );
$upload_max_size = ini_get( 'upload_max_filesize' ); $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( $result['label'] = sprintf(
/* translators: 1: post_max_size, 2: upload_max_filesize */ /* translators: 1: post_max_size, 2: upload_max_filesize */
__( 'The "%1$s" value is smaller than "%2$s".' ), __( 'The "%1$s" value is smaller than "%2$s".' ),