WordPress.org

Make WordPress Core

Ticket #23540: 23540.3.diff

File 23540.3.diff, 4.4 KB (added by DrewAPicture, 2 years ago)
  • wp-admin/includes/ms.php

     
    528528        if ( !is_super_admin() ) 
    529529                return false; 
    530530        if ( get_site_option( 'wpmu_upgrade_site' ) != $wp_db_version ) 
    531                 echo "<div class='update-nag'>" . sprintf( __( 'Thank you for Updating! Please visit the <a href="%s">Update Network</a> page to update all your sites.' ), esc_url( network_admin_url( 'upgrade.php' ) ) ) . "</div>"; 
     531                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>"; 
    532532} 
    533533add_action( 'admin_notices', 'site_admin_notice' ); 
    534534add_action( 'network_admin_notices', 'site_admin_notice' ); 
  • wp-admin/network/menu.php

     
    5656unset($update_data); 
    5757 
    5858$submenu[ 'upgrade.php' ][10] = array( __( 'Available Updates' ), 'update_core', 'update-core.php' ); 
    59 $submenu[ 'upgrade.php' ][15] = array( __( 'Update Network' ), 'manage_network', 'upgrade.php' ); 
     59$submenu[ 'upgrade.php' ][15] = array( __( 'Upgrade Network' ), 'manage_network', 'upgrade.php' ); 
    6060 
    6161$menu[99] = array( '', 'read', 'separator-last', '', 'wp-menu-separator-last' ); 
    6262 
  • wp-admin/network/upgrade.php

     
    1515 
    1616require_once( ABSPATH . WPINC . '/http.php' ); 
    1717 
    18 $title = __( 'Update Network' ); 
     18$title = __( 'Upgrade Network' ); 
    1919$parent_file = 'upgrade.php'; 
    2020 
    2121get_current_screen()->add_help_tab( array( 
    2222        'id'      => 'overview', 
    2323        'title'   => __('Overview'), 
    2424        'content' => 
    25                 '<p>' . __('Only use this screen once you have updated to a new version of WordPress through Updates/Available Updates (via the Network Administration navigation menu or the Toolbar). Clicking the Update Network button will step through each site in the network, five at a time, and make sure any database updates are applied.') . '</p>' . 
     25                '<p>' . __('Only use this screen once you have updated to a new version of WordPress through Updates/Available Updates (via the Network Administration navigation menu or the Toolbar). Clicking the Upgrade Network button will step through each site in the network, five at a time, and make sure any database updates are applied.') . '</p>' . 
    2626                '<p>' . __('If a version update to core has not happened, clicking this button won&#8217;t affect anything.') . '</p>' . 
    2727                '<p>' . __('If this process fails for any reason, users logging in to their sites will force the same update.') . '</p>' 
    2828) ); 
    2929 
    3030get_current_screen()->set_help_sidebar( 
    3131        '<p><strong>' . __('For more information:') . '</strong></p>' . 
    32         '<p>' . __('<a href="http://codex.wordpress.org/Network_Admin_Updates_Screen" target="_blank">Documentation on Update Network</a>') . '</p>' . 
     32        '<p>' . __('<a href="http://codex.wordpress.org/Network_Admin_Updates_Screen" target="_blank">Documentation on Upgrade Network</a>') . '</p>' . 
    3333        '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>' 
    3434); 
    3535 
     
    4040 
    4141echo '<div class="wrap">'; 
    4242screen_icon('tools'); 
    43 echo '<h2>' . __( 'Update Network' ) . '</h2>'; 
     43echo '<h2>' . __( 'Upgrade Network' ) . '</h2>'; 
    4444 
    4545$action = isset($_GET['action']) ? $_GET['action'] : 'show'; 
    4646 
     
    8484        break; 
    8585        case 'show': 
    8686        default: 
    87                 ?><p><?php _e( 'You can update all the sites on your network through this page. It works by calling the update script of each site automatically. Hit the link below to update.' ); ?></p> 
    88                 <p><a class="button" href="upgrade.php?action=upgrade"><?php _e("Update Network"); ?></a></p><?php 
     87                ?> 
     88                <h3><?php _e( 'Database Upgrade Required' ); ?></h3> 
     89                <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> 
     90                <p><?php _e( 'The upgrade process may take a little while, so please be patient.' ); ?></p> 
     91                <p><a class="button" href="upgrade.php?action=upgrade"><?php _e( 'Upgrade Network' ); ?></a></p> 
     92                <?php 
    8993                do_action( 'wpmu_upgrade_page' ); 
    9094        break; 
    9195}