WordPress.org

Make WordPress Core

Changeset 15484


Ignore:
Timestamp:
08/02/2010 03:36:57 PM (9 years ago)
Author:
ryan
Message:

Update network upgrade links. see #14435

Location:
trunk/wp-admin
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/admin-header.php

    r15481 r15484  
    173173screen_meta($current_screen);
    174174
     175if ( is_multisite() ) {
     176    if ( is_network_admin() )
     177        do_action('network_admin_notices');
     178    else
     179        do_action('site_admin_notices');
     180} else {
     181    do_action('network_admin_notices');
     182    do_action('site_admin_notices');
     183}
     184
    175185do_action('admin_notices');
    176186
  • trunk/wp-admin/includes/ms.php

    r15381 r15484  
    732732        return false;
    733733    if ( get_site_option( 'wpmu_upgrade_site' ) != $wp_db_version )
    734         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( admin_url( 'ms-upgrade-network.php' ) ) ) . "</div>";
     734        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>";
    735735}
    736736add_action( 'admin_notices', 'site_admin_notice' );
  • trunk/wp-admin/network/upgrade.php

    r15481 r15484  
    6363        }
    6464        echo "</ul>";
    65         ?><p><?php _e( 'If your browser doesn&#8217;t start loading the next page automatically, click this link:' ); ?> <a class="button" href="ms-upgrade-network.php?action=upgrade&amp;n=<?php echo ($n + 5) ?>"><?php _e("Next Sites"); ?></a></p>
     65        ?><p><?php _e( 'If your browser doesn&#8217;t start loading the next page automatically, click this link:' ); ?> <a class="button" href="upgrade.php?action=upgrade&amp;n=<?php echo ($n + 5) ?>"><?php _e("Next Sites"); ?></a></p>
    6666        <script type='text/javascript'>
    6767        <!--
Note: See TracChangeset for help on using the changeset viewer.