From c7e84936c862e20dbf5bc104cedd2ac76e1eb4cd Mon Sep 17 00:00:00 2001
From: "Dominik Schilling (ocean90)" <ocean90@git.wordpress.org>
Date: Tue, 9 Feb 2016 14:29:06 +0000
Subject: [PATCH] Multisite: Don't show the database upgrade admin notice on
 the upgrade page itself.

Fixes #35782.

git-svn-id: https://develop.svn.wordpress.org/trunk@36505 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/ms.php | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/wp-admin/includes/ms.php b/src/wp-admin/includes/ms.php
index e3ce2a36e1..8c2f8224d8 100644
--- a/src/wp-admin/includes/ms.php
+++ b/src/wp-admin/includes/ms.php
@@ -748,16 +748,25 @@ function mu_dropdown_languages( $lang_files = array(), $current = '' ) {
  *
  * @since 3.0.0
  *
- * @global int $wp_db_version The version number of the database.
+ * @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>";
+	}
 }
 
 /**