Ticket #35782: 35782.patch

src/wp-admin/includes/ms.php

@@ -749 +749 @@
  * @since 3.0.0
  *
  * @global int $wp_db_version The version number of the database.
+ * @global string $pagenow
  *
  * @return false False if the current user is not a super admin.
  */
 function site_admin_notice() {
-        global $wp_db_version;
-        if ( !is_super_admin() )
+        global $wp_db_version, $pagenow;
+        if ( ! is_super_admin() ) {
                 return false;
-        if ( get_site_option( 'wpmu_upgrade_site' ) != $wp_db_version )
+        }
+
+        if ( 'upgrade.php' == $pagenow ) {
+                return;
+        }
+
+        if ( get_site_option( 'wpmu_upgrade_site' ) != $wp_db_version ) {
                 echo "<div class='update-nag'>" . sprintf( __( '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' ) ) ) . "</div>";
 }
+}
 
 /**
  * Avoids a collision between a site slug and a permalink slug.