Changeset 17217

Timestamp:

01/04/2011 08:36:06 AM (15 years ago)

Author:

nacin

Message:

Update indicator for the Network Admin link. fixes #16063.

Location:

trunk/wp-admin

Files:

• admin-header.php (modified) (2 diffs)
• menu.php (modified) (3 diffs)

trunk/wp-admin/admin-header.php

@@ -152 +152 @@
 if ( is_multisite() && is_super_admin() ) {
     if ( !is_network_admin() )
-        $links[10] = '| <a href="' . network_admin_url() . '" title="' . esc_attr__('Network Admin') . '">' . __('Network Admin') . '</a>';
+        $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>';
     else
         $links[10] = '| <a href="' . get_dashboard_url( get_current_user_id() ) . '" title="' . esc_attr__('Site Admin') . '">' . __('Site Admin') . '</a>';
@@ -171 +171 @@
 <div id="wpbody">
 <?php
-unset($title_class, $blog_name);
+unset($title_class, $blog_name, $total_update_count, $update_title);
 
 require(ABSPATH . 'wp-admin/menu-header.php');

trunk/wp-admin/menu.php

@@ -29 +29 @@
 if ( is_multisite() ) {
     $submenu[ 'index.php' ][5] = array( __('My Sites'), 'read', 'my-sites.php' );
-} else {
+}
+
+if ( ! is_multisite() || is_super_admin() ) {
     $plugin_update_count = $theme_update_count = $wordpress_update_count = 0;
     $update_plugins = get_site_transient( 'update_plugins' );
@@ -41 +43 @@
         $wordpress_update_count = 1;
 
-    $update_count = $plugin_update_count + $theme_update_count + $wordpress_update_count;
+    $total_update_count = $plugin_update_count + $theme_update_count + $wordpress_update_count;
     $update_title = array();
     if ( $wordpress_update_count )
@@ -51 +53 @@
 
     $update_title = !empty($update_title) ? esc_attr(implode(', ', $update_title)) : '';
-
-    $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);
-}
+}
+
+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');
+}
+
+unset($plugin_update_count, $theme_update_count, $wordpress_update_count, $update_themes, $update_plugins, $update_wordpress);
 
 $menu[4] = array( '', 'read', 'separator1', '', 'wp-menu-separator' );