Changeset 45239

Timestamp:

04/18/2019 12:33:03 AM (7 years ago)

Author:

azaozz

Message:

Site Health info tab: Remove the "Directories and Sizes" section on Multisite installations. Most of the info shown there doesn't apply for multisite.

Props xkon, desrosj, azaozz.

Location:

trunk/src

Files:

• js/_enqueues/admin/site-health.js (modified) (3 diffs)
• wp-admin/includes/ajax-actions.php (modified) (1 diff)
• wp-admin/includes/class-wp-debug-data.php (modified) (2 diffs)

trunk/src/js/_enqueues/admin/site-health.js

@@ -16 +16 @@
         var clipboard = new ClipboardJS( '.site-health-copy-buttons .copy-button' );
         var isDebugTab = $( '.health-check-body.health-check-debug-tab' ).length;
+        var pathsSizesSection = $( '#health-check-accordion-block-wp-paths-sizes' );
 
         // Debug information copy section.
@@ -296 +297 @@
                 copyButton.attr( 'data-clipboard-text', clipdoardText );
 
-                $( '#health-check-accordion-block-wp-paths-sizes' ).find( 'td[class]' ).each( function( i, element ) {
+                pathsSizesSection.find( 'td[class]' ).each( function( i, element ) {
                         var td = $( element );
                         var name = td.attr( 'class' );
@@ -307 +308 @@
 
         if ( isDebugTab ) {
-                getDirectorySizes();
+                if ( pathsSizesSection.length ) {
+                        getDirectorySizes();
+                } else {
+                        RecalculateProgression();
+                }
         }
 } );

trunk/src/wp-admin/includes/ajax-actions.php

@@ -4968 +4968 @@
         check_ajax_referer( 'health-check-site-status-result' );
 
-        if ( ! current_user_can( 'install_plugins' ) ) {
+        if ( ! current_user_can( 'install_plugins' ) || is_multisite() ) {
                 wp_send_json_error();
         }

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

@@ -110 +110 @@
                 );
 
-                $info['wp-paths-sizes'] = array(
-                        'label'  => __( 'Directories and Sizes' ),
-                        'fields' => array(),
-                );
+                if ( ! $is_multisite ) {
+                        $info['wp-paths-sizes'] = array(
+                                'label'  => __( 'Directories and Sizes' ),
+                                'fields' => array(),
+                        );
+                }
 
                 $info['wp-dropins'] = array(
@@ -390 +392 @@
                 }
 
-                $loading = __( 'Loading…' );
-
-                $info['wp-paths-sizes']['fields'] = array(
-                        'wordpress_path' => array(
-                                'label' => __( 'WordPress directory location' ),
-                                'value' => untrailingslashit( ABSPATH ),
-                        ),
-                        'wordpress_size' => array(
-                                'label' => __( 'WordPress directory size' ),
-                                'value' => $loading,
-                                'debug' => 'loading...',
-                        ),
-                        'uploads_path'   => array(
-                                'label' => __( 'Uploads directory location' ),
-                                'value' => $upload_dir['basedir'],
-                        ),
-                        'uploads_size'   => array(
-                                'label' => __( 'Uploads directory size' ),
-                                'value' => $loading,
-                                'debug' => 'loading...',
-                        ),
-                        'themes_path'    => array(
-                                'label' => __( 'Themes directory location' ),
-                                'value' => get_theme_root(),
-                        ),
-                        'themes_size'    => array(
-                                'label' => __( 'Themes directory size' ),
-                                'value' => $loading,
-                                'debug' => 'loading...',
-                        ),
-                        'plugins_path'   => array(
-                                'label' => __( 'Plugins directory location' ),
-                                'value' => WP_PLUGIN_DIR,
-                        ),
-                        'plugins_size'   => array(
-                                'label' => __( 'Plugins directory size' ),
-                                'value' => $loading,
-                                'debug' => 'loading...',
-                        ),
-                        'database_size'  => array(
-                                'label' => __( 'Database size' ),
-                                'value' => $loading,
-                                'debug' => 'loading...',
-                        ),
-                        'total_size'     => array(
-                                'label' => __( 'Total installation size' ),
-                                'value' => $loading,
-                                'debug' => 'loading...',
-                        ),
-                );
+                // Remove accordion for Directories and Sizes if in Multisite.
+                if ( ! $is_multisite ) {
+                        $loading = __( 'Loading…' );
+
+                        $info['wp-paths-sizes']['fields'] = array(
+                                'wordpress_path' => array(
+                                        'label' => __( 'WordPress directory location' ),
+                                        'value' => untrailingslashit( ABSPATH ),
+                                ),
+                                'wordpress_size' => array(
+                                        'label' => __( 'WordPress directory size' ),
+                                        'value' => $loading,
+                                        'debug' => 'loading...',
+                                ),
+                                'uploads_path'   => array(
+                                        'label' => __( 'Uploads directory location' ),
+                                        'value' => $upload_dir['basedir'],
+                                ),
+                                'uploads_size'   => array(
+                                        'label' => __( 'Uploads directory size' ),
+                                        'value' => $loading,
+                                        'debug' => 'loading...',
+                                ),
+                                'themes_path'    => array(
+                                        'label' => __( 'Themes directory location' ),
+                                        'value' => get_theme_root(),
+                                ),
+                                'themes_size'    => array(
+                                        'label' => __( 'Themes directory size' ),
+                                        'value' => $loading,
+                                        'debug' => 'loading...',
+                                ),
+                                'plugins_path'   => array(
+                                        'label' => __( 'Plugins directory location' ),
+                                        'value' => WP_PLUGIN_DIR,
+                                ),
+                                'plugins_size'   => array(
+                                        'label' => __( 'Plugins directory size' ),
+                                        'value' => $loading,
+                                        'debug' => 'loading...',
+                                ),
+                                'database_size'  => array(
+                                        'label' => __( 'Database size' ),
+                                        'value' => $loading,
+                                        'debug' => 'loading...',
+                                ),
+                                'total_size'     => array(
+                                        'label' => __( 'Total installation size' ),
+                                        'value' => $loading,
+                                        'debug' => 'loading...',
+                                ),
+                        );
+                }
 
                 // Get a list of all drop-in replacements.