Ticket #47085: 47085.diff

src/wp-admin/includes/class-wp-site-health.php

@@ -51 +51 @@
          */
         public function enqueue_scripts() {
                 $screen = get_current_screen();
-                if ( 'site-health' !== $screen->id ) {
+                if ( 'site-health' !== $screen->id && 'site-health-network' !== $screen->id ) {
                         return;
                 }
 
@@ -80 +80 @@
                         $health_check_js_variables['site_status']['issues'] = $issue_counts;
                 }
 
-                if ( 'site-health' === $screen->id && ! isset( $_GET['tab'] ) ) {
+                if ( ( 'site-health' === $screen->id || 'site-health-network' === $screen->id ) 
+                        && ! isset( $_GET['tab'] ) ) {
                         $tests = WP_Site_Health::get_tests();
 
                         // Don't run https test on localhost

src/wp-admin/menu.php

@@ -263 +263 @@
         $submenu['tools.php'][5]  = array( __( 'Available Tools' ), 'edit_posts', 'tools.php' );
         $submenu['tools.php'][10] = array( __( 'Import' ), 'import', 'import.php' );
         $submenu['tools.php'][15] = array( __( 'Export' ), 'export', 'export.php' );
-        $submenu['tools.php'][20] = array( __( 'Site Health' ), 'view_site_health_checks', 'site-health.php' );
+        // Hide Site Health in individual sites.
+        if ( ! is_multisite() ) {
+                $submenu['tools.php'][20] = array( __( 'Site Health' ), 'view_site_health_checks', 'site-health.php' );
+        }
         $submenu['tools.php'][25] = array( __( 'Export Personal Data' ), 'export_others_personal_data', 'export-personal-data.php' );
         $submenu['tools.php'][30] = array( __( 'Erase Personal Data' ), 'erase_others_personal_data', 'erase-personal-data.php' );
 if ( is_multisite() && ! is_main_site() ) {

src/wp-admin/network/menu.php

@@ -67 +67 @@
         $submenu['settings.php'][5]  = array( __( 'Network Settings' ), 'manage_network_options', 'settings.php' );
         $submenu['settings.php'][10] = array( __( 'Network Setup' ), 'setup_network', 'setup.php' );
 }
+
+$menu[30] = array( __( 'Site Health' ), 'view_site_health_checks', 'site-health.php', '', 'menu-top menu-icon-site-health', 'menu-site-health', 'dashicons-heart' );
+
 unset( $update_data );
 
 $menu[99] = array( '', 'exist', 'separator-last', '', 'wp-menu-separator' );

new file src/wp-admin/network/site-health.php

@@ +1 @@
+<?php
+/**
+ * Network Site Health administration panel.
+ *
+ * @package WordPress
+ * @subpackage Multisite
+ * @since 5.3.0
+ */
+
+/** Load WordPress Administration Bootstrap */
+require_once( dirname( __FILE__ ) . '/admin.php' );
+
+require( ABSPATH . 'wp-admin/site-health.php' );

src/wp-admin/site-health.php

@@ -51 +51 @@
         </div>
 
         <nav class="health-check-tabs-wrapper hide-if-no-js" aria-label="<?php esc_attr_e( 'Secondary menu' ); ?>">
-                <a href="<?php echo esc_url( admin_url( 'site-health.php' ) ); ?>" class="health-check-tab active" aria-current="true">
+                <a href="<?php echo esc_url( network_admin_url( 'site-health.php' ) ); ?>" class="health-check-tab active" aria-current="true">
                         <?php
                         /* translators: tab heading for Site Health Status page */
                         _ex( 'Status', 'Site Health' );
                         ?>
                 </a>
 
-                <a href="<?php echo esc_url( admin_url( 'site-health.php?tab=debug' ) ); ?>" class="health-check-tab">
+                <a href="<?php echo esc_url( network_admin_url( 'site-health.php?tab=debug' ) ); ?>" class="health-check-tab">
                         <?php
                         /* translators: tab heading for Site Health Info page */
                         _ex( 'Info', 'Site Health' );

src/wp-includes/admin-bar.php

@@ -553 +553 @@
                                 )
                         );
                 }
+
+                if ( current_user_can( 'view_site_health_checks' ) ) {
+                        $wp_admin_bar->add_menu(
+                                array(
+                                        'parent' => 'network-admin',
+                                        'id'     => 'network-admin-sh',
+                                        'title'  => __( 'Site Health' ),
+                                        'href'   => network_admin_url( 'site-health.php' ),
+                                )
+                        );
+                }
+
         }
 
         // Add site links