<!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>[17217] trunk/wp-admin: Update indicator for the Network Admin link.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17217">17217</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2011-01-04 08:36:06 +0000 (Tue, 04 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update indicator for the Network Admin link. fixes <a href="http://trac.wordpress.org/ticket/16063">#16063</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminheaderphp">trunk/wp-admin/admin-header.php</a></li>
<li><a href="#trunkwpadminmenuphp">trunk/wp-admin/menu.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 (17216 => 17217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-header.php 2011-01-04 07:29:22 UTC (rev 17216)
+++ trunk/wp-admin/admin-header.php 2011-01-04 08:36:06 UTC (rev 17217)
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx"> $links[5] = sprintf(__('Howdy, <a href="%1$s" title="Edit your profile">%2$s</a>'), 'profile.php', $user_identity);
</span><span class="cx"> if ( is_multisite() && is_super_admin() ) {
</span><span class="cx"> if ( !is_network_admin() )
</span><del>- $links[10] = '| <a href="' . network_admin_url() . '" title="' . esc_attr__('Network Admin') . '">' . __('Network Admin') . '</a>';
</del><ins>+ $links[10] = '| <a href="' . network_admin_url() . '" title="' . ( ! empty( $update_title ) ? $update_title : esc_attr__('Network Admin') ) . '">' . __('Network Admin') . ( ! empty( $total_update_count ) ? ' (' . number_format_i18n( $total_update_count ) . ')' : '' ) . '</a>';
</ins><span class="cx"> else
</span><span class="cx"> $links[10] = '| <a href="' . get_dashboard_url( get_current_user_id() ) . '" title="' . esc_attr__('Site Admin') . '">' . __('Site Admin') . '</a>';
</span><span class="cx"> }
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx">
</span><span class="cx"> <div id="wpbody">
</span><span class="cx"> <?php
</span><del>-unset($title_class, $blog_name);
</del><ins>+unset($title_class, $blog_name, $total_update_count, $update_title);
</ins><span class="cx">
</span><span class="cx"> require(ABSPATH . 'wp-admin/menu-header.php');
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/menu.php (17216 => 17217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/menu.php 2011-01-04 07:29:22 UTC (rev 17216)
+++ trunk/wp-admin/menu.php 2011-01-04 08:36:06 UTC (rev 17217)
</span><span class="lines">@@ -28,7 +28,9 @@
</span><span class="cx">
</span><span class="cx"> if ( is_multisite() ) {
</span><span class="cx"> $submenu[ 'index.php' ][5] = array( __('My Sites'), 'read', 'my-sites.php' );
</span><del>-} else {
</del><ins>+}
+
+if ( ! is_multisite() || is_super_admin() ) {
</ins><span class="cx"> $plugin_update_count = $theme_update_count = $wordpress_update_count = 0;
</span><span class="cx"> $update_plugins = get_site_transient( 'update_plugins' );
</span><span class="cx"> if ( !empty($update_plugins->response) )
</span><span class="lines">@@ -40,7 +42,7 @@
</span><span class="cx"> if ( !empty($update_wordpress) && !in_array( $update_wordpress[0]->response, array('development', 'latest') ) )
</span><span class="cx"> $wordpress_update_count = 1;
</span><span class="cx">
</span><del>- $update_count = $plugin_update_count + $theme_update_count + $wordpress_update_count;
</del><ins>+ $total_update_count = $plugin_update_count + $theme_update_count + $wordpress_update_count;
</ins><span class="cx"> $update_title = array();
</span><span class="cx"> if ( $wordpress_update_count )
</span><span class="cx"> $update_title[] = sprintf(__('%d WordPress Update'), $wordpress_update_count);
</span><span class="lines">@@ -50,11 +52,14 @@
</span><span class="cx"> $update_title[] = sprintf(_n('%d Theme Update', '%d Themes Updates', $theme_update_count), $theme_update_count);
</span><span class="cx">
</span><span class="cx"> $update_title = !empty($update_title) ? esc_attr(implode(', ', $update_title)) : '';
</span><ins>+}
</ins><span class="cx">
</span><del>- $submenu[ 'index.php' ][10] = array( sprintf( __('Updates %s'), "<span class='update-plugins count-$update_count' title='$update_title'><span class='update-count'>" . number_format_i18n($update_count) . "</span></span>" ), 'update_core', 'update-core.php');
- unset($plugin_update_count, $theme_update_count, $wordpress_update_count, $update_count, $update_title, $update_themes, $update_plugins, $update_wordpress);
</del><ins>+if ( ! is_multisite() ) {
+ $submenu[ 'index.php' ][10] = array( sprintf( __('Updates %s'), "<span class='update-plugins count-$total_update_count' title='$total_update_title'><span class='update-count'>" . number_format_i18n($total_update_count) . "</span></span>" ), 'update_core', 'update-core.php');
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+unset($plugin_update_count, $theme_update_count, $wordpress_update_count, $update_themes, $update_plugins, $update_wordpress);
+
</ins><span class="cx"> $menu[4] = array( '', 'read', 'separator1', '', 'wp-menu-separator' );
</span><span class="cx">
</span><span class="cx"> $menu[5] = array( __('Posts'), 'edit_posts', 'edit.php', '', 'open-if-no-js menu-top menu-icon-post', 'menu-posts', 'div' );
</span></span></pre>
</div>
</div>
</body>
</html>