Hide 'Database Upgrade Required' on admin/network/upgrade.php when you are not being asked to upgrade, to prevent confusion.

Merges [25191] to the 3.6 branch.

props duck_.
fixes #24845.


Built from https://develop.svn.wordpress.org/branches/3.6@25192


git-svn-id: http://core.svn.wordpress.org/branches/3.6@25164 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-admin/network/upgrade.php

@@ -84,9 +84,12 @@ switch ( $action ) {
 	break;
 	case 'show':
 	default:
+		if ( get_site_option( 'wpmu_upgrade_site' ) != $GLOBALS['wp_db_version'] ) :
 		?>
 		<h3><?php _e( 'Database Upgrade Required' ); ?></h3>
 		<p><?php _e( 'WordPress has been updated! Before we send you on your way, we need to individually upgrade the sites in your network.' ); ?></p>
+		<?php endif; ?>
+
 		<p><?php _e( 'The upgrade process may take a little while, so please be patient.' ); ?></p>
 		<p><a class="button" href="upgrade.php?action=upgrade"><?php _e( 'Upgrade Network' ); ?></a></p>
 		<?php