Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-30 16:55:02 +02:00
Code Issues Projects Releases Wiki Activity

Update network upgrade links. see #14435

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15484 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2010-08-02 15:36:57 +00:00
parent 551dc49b7b
commit 44799523bc
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wp-admin/admin-header.php
View File

@ -172,6 +172,16 @@ $current_screen->parent_base = str_replace('.php', '', $current_screen->parent_b
<?php
screen_meta($current_screen);
if ( is_multisite() ) {
if ( is_network_admin() )
do_action('network_admin_notices');
else
do_action('site_admin_notices');
} else {
do_action('network_admin_notices');
do_action('site_admin_notices');
}
do_action('admin_notices');
if ( $parent_file == 'options-general.php' )

2
wp-admin/includes/ms.php
View File

@ -731,7 +731,7 @@ function site_admin_notice() {
if ( !is_super_admin() )
return false;
if ( get_site_option( 'wpmu_upgrade_site' ) != $wp_db_version )
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>";
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>";
}
add_action( 'admin_notices', 'site_admin_notice' );

2
wp-admin/network/upgrade.php
View File

@ -62,7 +62,7 @@ switch ( $action ) {
do_action( 'wpmu_upgrade_site', $details[ 'blog_id' ] );
}
echo "</ul>";
?><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>
?><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>
<script type='text/javascript'>
<!--
function nextpage() {