Changeset 45108

Timestamp:

04/03/2019 11:19:53 AM (6 years ago)

Author:

SergeyBiryukov

Message:

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

Props m_uysl.
Fixes #46729.

File:

• trunk/src/wp-admin/includes/class-wp-debug-data.php (modified) (4 diffs)

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

@@ -41 +41 @@
         }
 
-        $upload_dir = wp_upload_dir();
+        $upload_dir = wp_get_upload_dir();
+
         if ( file_exists( ABSPATH . 'wp-config.php' ) ) {
             $wp_config_path = ABSPATH . 'wp-config.php';
@@ -314 +315 @@
         $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
@@ -339 +337 @@
         }
 
+        // Go through the various installation directories and calculate their sizes.
         $size_directories = array(
             'wordpress' => array(
@@ -353 +352 @@
             ),
             'uploads'   => array(
-                'path' => $uploads_dir['basedir'],
+                'path' => $upload_dir['basedir'],
                 'size' => 0,
             ),