<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[15484] trunk/wp-admin: Update network upgrade links.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15484">15484</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-08-02 15:36:57 +0000 (Mon, 02 Aug 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update network upgrade links. see <a href="http://trac.wordpress.org/ticket/14435">#14435</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminheaderphp">trunk/wp-admin/admin-header.php</a></li>
<li><a href="#trunkwpadminincludesmsphp">trunk/wp-admin/includes/ms.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="trunkwpadminadminheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-header.php (15483 => 15484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-header.php 2010-07-30 21:33:39 UTC (rev 15483)
+++ trunk/wp-admin/admin-header.php 2010-08-02 15:36:57 UTC (rev 15484)
</span><span class="lines">@@ -172,6 +172,16 @@
</span><span class="cx"> <?php
</span><span class="cx"> screen_meta($current_screen);
</span><span class="cx">
</span><ins>+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');
+}
+
</ins><span class="cx"> do_action('admin_notices');
</span><span class="cx">
</span><span class="cx"> if ( $parent_file == 'options-general.php' )
</span></span></pre></div>
<a id="trunkwpadminincludesmsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ms.php (15483 => 15484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ms.php 2010-07-30 21:33:39 UTC (rev 15483)
+++ trunk/wp-admin/includes/ms.php 2010-08-02 15:36:57 UTC (rev 15484)
</span><span class="lines">@@ -731,7 +731,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( admin_url( 'ms-upgrade-network.php' ) ) ) . "</div>";
</del><ins>+ 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>";
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'admin_notices', 'site_admin_notice' );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminnetworkupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/upgrade.php (15483 => 15484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/upgrade.php 2010-07-30 21:33:39 UTC (rev 15483)
+++ trunk/wp-admin/network/upgrade.php 2010-08-02 15:36:57 UTC (rev 15484)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> do_action( 'wpmu_upgrade_site', $details[ 'blog_id' ] );
</span><span class="cx"> }
</span><span class="cx"> echo "</ul>";
</span><del>- ?><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>
</del><ins>+ ?><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>
</ins><span class="cx"> <script type='text/javascript'>
</span><span class="cx"> <!--
</span><span class="cx"> function nextpage() {
</span></span></pre>
</div>
</div>
</body>
</html>