<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[23619] trunk/wp-admin: Call them network upgrades rather than network updates to better indicate that they are DB upgrades rather than code/file upgrades.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/23619">23619</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2013-03-05 17:02:31 +0000 (Tue, 05 Mar 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Call them network upgrades rather than network updates to better indicate that they are DB upgrades rather than code/file upgrades.
Improve the contextual help for the Network Upgrade screen.
Props DrewAPicture
fixes <a href="http://core.trac.wordpress.org/ticket/23540">#23540</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesmsphp">trunk/wp-admin/includes/ms.php</a></li>
<li><a href="#trunkwpadminnetworkmenuphp">trunk/wp-admin/network/menu.php</a></li>
<li><a href="#trunkwpadminnetworkupgradephp">trunk/wp-admin/network/upgrade.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesmsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ms.php (23618 => 23619)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ms.php 2013-03-05 16:14:14 UTC (rev 23618)
+++ trunk/wp-admin/includes/ms.php 2013-03-05 17:02:31 UTC (rev 23619)
</span><span class="lines">@@ -528,7 +528,7 @@
</span><span class="cx"> if ( !is_super_admin() )
</span><span class="cx"> return false;
</span><span class="cx"> if ( get_site_option( 'wpmu_upgrade_site' ) != $wp_db_version )
</span><del>- 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>";
</del><ins>+ 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>";
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'admin_notices', 'site_admin_notice' );
</span><span class="cx"> add_action( 'network_admin_notices', 'site_admin_notice' );
</span></span></pre></div>
<a id="trunkwpadminnetworkmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/menu.php (23618 => 23619)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/menu.php 2013-03-05 16:14:14 UTC (rev 23618)
+++ trunk/wp-admin/network/menu.php 2013-03-05 17:02:31 UTC (rev 23619)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> unset($update_data);
</span><span class="cx">
</span><span class="cx"> $submenu[ 'upgrade.php' ][10] = array( __( 'Available Updates' ), 'update_core', 'update-core.php' );
</span><del>-$submenu[ 'upgrade.php' ][15] = array( __( 'Update Network' ), 'manage_network', 'upgrade.php' );
</del><ins>+$submenu[ 'upgrade.php' ][15] = array( __( 'Upgrade Network' ), 'manage_network', 'upgrade.php' );
</ins><span class="cx">
</span><span class="cx"> $menu[99] = array( '', 'read', 'separator-last', '', 'wp-menu-separator-last' );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminnetworkupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/upgrade.php (23618 => 23619)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/upgrade.php 2013-03-05 16:14:14 UTC (rev 23618)
+++ trunk/wp-admin/network/upgrade.php 2013-03-05 17:02:31 UTC (rev 23619)
</span><span class="lines">@@ -15,21 +15,21 @@
</span><span class="cx">
</span><span class="cx"> require_once( ABSPATH . WPINC . '/http.php' );
</span><span class="cx">
</span><del>-$title = __( 'Update Network' );
</del><ins>+$title = __( 'Upgrade Network' );
</ins><span class="cx"> $parent_file = 'upgrade.php';
</span><span class="cx">
</span><span class="cx"> get_current_screen()->add_help_tab( array(
</span><span class="cx"> 'id' => 'overview',
</span><span class="cx"> 'title' => __('Overview'),
</span><span class="cx"> 'content' =>
</span><del>- '<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>' .
</del><ins>+ '<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>' .
</ins><span class="cx"> '<p>' . __('If a version update to core has not happened, clicking this button won&#8217;t affect anything.') . '</p>' .
</span><span class="cx"> '<p>' . __('If this process fails for any reason, users logging in to their sites will force the same update.') . '</p>'
</span><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> get_current_screen()->set_help_sidebar(
</span><span class="cx"> '<p><strong>' . __('For more information:') . '</strong></p>' .
</span><del>- '<p>' . __('<a href="http://codex.wordpress.org/Network_Admin_Updates_Screen" target="_blank">Documentation on Update Network</a>') . '</p>' .
</del><ins>+ '<p>' . __('<a href="http://codex.wordpress.org/Network_Admin_Updates_Screen" target="_blank">Documentation on Upgrade Network</a>') . '</p>' .
</ins><span class="cx"> '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
</span><span class="cx"> );
</span><span class="cx">
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx">
</span><span class="cx"> echo '<div class="wrap">';
</span><span class="cx"> screen_icon('tools');
</span><del>-echo '<h2>' . __( 'Update Network' ) . '</h2>';
</del><ins>+echo '<h2>' . __( 'Upgrade Network' ) . '</h2>';
</ins><span class="cx">
</span><span class="cx"> $action = isset($_GET['action']) ? $_GET['action'] : 'show';
</span><span class="cx">
</span><span class="lines">@@ -84,8 +84,12 @@
</span><span class="cx"> break;
</span><span class="cx"> case 'show':
</span><span class="cx"> default:
</span><del>- ?><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>
- <p><a class="button" href="upgrade.php?action=upgrade"><?php _e("Update Network"); ?></a></p><?php
</del><ins>+ ?>
+ <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>
+ <p><a class="button" href="upgrade.php?action=upgrade"><?php _e( 'Upgrade Network' ); ?></a></p>
+ <?php
</ins><span class="cx"> do_action( 'wpmu_upgrade_page' );
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>