WordPress.org

Make WordPress Core

Ticket #25777: 25777.diff

File 25777.diff, 811 bytes (added by Ipstenu, 7 years ago)

Supress update network if you have to upgrade too!

  • blog/wp-admin/includes/ms.php

     
    607607        global $wp_db_version;
    608608        if ( !is_super_admin() )
    609609                return false;
    610         if ( get_site_option( 'wpmu_upgrade_site' ) != $wp_db_version )
     610
     611        $cur = get_preferred_from_update_core();
     612        if ( get_site_option( 'wpmu_upgrade_site' ) != $wp_db_version && ( ! isset( $cur->response ) || $cur->response != 'upgrade' ) )
    611613                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>";
    612614}
    613615add_action( 'admin_notices', 'site_admin_notice' );