Site Health: Use wp_get_upload_dir() instead of wp_upload_dir(), remove duplicate call.

Props m_uysl.
Fixes #46729.

git-svn-id: https://develop.svn.wordpress.org/trunk@45108 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2019-04-03 11:19:53 +00:00
parent 681edf04bc
commit a0ca5afd89

View File

@ -40,7 +40,8 @@ class WP_Debug_Data {
} }
} }
$upload_dir = wp_upload_dir(); $upload_dir = wp_get_upload_dir();
if ( file_exists( ABSPATH . 'wp-config.php' ) ) { if ( file_exists( ABSPATH . 'wp-config.php' ) ) {
$wp_config_path = ABSPATH . 'wp-config.php'; $wp_config_path = ABSPATH . 'wp-config.php';
// phpcs:ignore Generic.PHP.NoSilencedErrors.Discouraged // phpcs:ignore Generic.PHP.NoSilencedErrors.Discouraged
@ -313,9 +314,6 @@ class WP_Debug_Data {
$size_db = WP_Debug_Data::get_database_size(); $size_db = WP_Debug_Data::get_database_size();
// Go through the various installation directories and calculate their sizes.
$uploads_dir = wp_upload_dir();
/* /*
* We will be using the PHP max execution time to prevent the size calculations * We will be using the PHP max execution time to prevent the size calculations
* from causing a timeout. The default value is 30 seconds, and some * from causing a timeout. The default value is 30 seconds, and some
@ -338,6 +336,7 @@ class WP_Debug_Data {
$max_execution_time -= 1; $max_execution_time -= 1;
} }
// Go through the various installation directories and calculate their sizes.
$size_directories = array( $size_directories = array(
'wordpress' => array( 'wordpress' => array(
'path' => ABSPATH, 'path' => ABSPATH,
@ -352,7 +351,7 @@ class WP_Debug_Data {
'size' => 0, 'size' => 0,
), ),
'uploads' => array( 'uploads' => array(
'path' => $uploads_dir['basedir'], 'path' => $upload_dir['basedir'],
'size' => 0, 'size' => 0,
), ),
); );