Ticket #54624: 54624.diff

src/wp-admin/css/edit.css

@@ -754 +754 @@
         padding-top: 8px;
 }
 
+.privacy-settings .update-nag,
+.site-health .update-nag {
+        display: block;
+}
+
+.privacy-settings .update-nag {
+        margin: 5px 15px 20px;
+}
+
 .privacy-settings-tabs-wrapper {
         /* IE 11 */
         display: -ms-inline-grid;

src/wp-admin/includes/ms.php

@@ -708 +708 @@
                 return;
         }
 
+        $inline = ' inline';
+        $screen = get_current_screen();
+
+        if ( $screen && in_array( $screen->id, array( 'site-health', 'options-privacy' ), true ) ) {
+                $inline = '';
+        }
+
         if ( (int) get_site_option( 'wpmu_upgrade_site' ) !== $wp_db_version ) {
-                echo "<div class='update-nag notice notice-warning inline'>" . sprintf(
+                echo "<div class='update-nag notice notice-warning$inline'>" . sprintf(
                         /* translators: %s: URL to Upgrade Network screen. */
                         __( 'Thank you for Updating! Please visit the <a href="%s">Upgrade Network</a> page to update all your sites.' ),
                         esc_url( network_admin_url( 'upgrade.php' ) )

src/wp-admin/includes/update.php

@@ -325 +325 @@
                 );
         }
 
-        echo "<div class='update-nag notice notice-warning inline'>$msg</div>";
+        $inline = ' inline';
+        $screen = get_current_screen();
+
+        if ( $screen && in_array( $screen->id, array( 'site-health', 'options-privacy' ), true ) ) {
+                $inline = '';
+        }
+
+        echo "<div class='update-nag notice notice-warning$inline'>$msg</div>";
 }
 
 /**
@@ -857 +864 @@
                 $msg = __( 'An automated WordPress update has failed to complete! Please notify the site administrator.' );
         }
 
-        echo "<div class='update-nag notice notice-warning inline'>$msg</div>";
+        $inline = ' inline';
+        $screen = get_current_screen();
+
+        if ( $screen && in_array( $screen->id, array( 'site-health', 'options-privacy' ), true ) ) {
+                $inline = '';
+        }
+
+        echo "<div class='update-nag notice notice-warning$inline'>$msg</div>";
 }
 
 /**