Changeset 25192

Timestamp:

08/31/2013 12:58:48 AM (11 years ago)

Author:

nacin

Message:

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.

Location:

branches/3.6

Files:

• . (modified) (1 prop)
• wp-admin/network/upgrade.php (modified) (1 diff)

branches/3.6/wp-admin/network/upgrade.php

@@ -85 +85 @@
     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>