Wordpress 3.7

[autoinstalls/wordpress.git] / wp-admin / network / upgrade.php

diff --git a/wp-admin/network/upgrade.php b/wp-admin/network/upgrade.php
index 74156547e9e9b237acc4fb1283a2239e37dbbeb4..96137b34de640e459bad282b370cba3734845c46 100644 (file)
--- a/wp-admin/network/upgrade.php
+++ b/wp-admin/network/upgrade.php
@@ -8,7 +8,7 @@
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( './admin.php' );
+require_once( dirname( __FILE__ ) . '/admin.php' );
 
 if ( ! is_multisite() )
        wp_die( __( 'Multisite support is not enabled.' ) );
@@ -33,7 +33,7 @@ get_current_screen()->set_help_sidebar(
        '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
 );
 
-require_once('../admin-header.php');
+require_once( ABSPATH . 'wp-admin/admin-header.php' );
 
 if ( ! current_user_can( 'manage_network' ) )
        wp_die( __( 'You do not have permission to access this page.' ) );
@@ -84,10 +84,13 @@ 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>
-               <p><?php _e( 'The upgrade process may take a little while, so please be patient.' ); ?></p>
+               <?php endif; ?>
+
+               <p><?php _e( 'The database 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
                do_action( 'wpmu_upgrade_page' );
@@ -96,4 +99,4 @@ switch ( $action ) {
 ?>
 </div>
 
-<?php include('../admin-footer.php'); ?>
+<?php include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>