Changeset 18468 for trunk/wp-admin/network/menu.php

Timestamp:

07/26/2011 06:39:57 PM (14 years ago)

Author:

ryan

Message:

Consolidate update count code into wp_get_update_data(). Props mitchoyoshitaka. fixes #17694

File:

• trunk/wp-admin/network/menu.php (modified) (3 diffs)

trunk/wp-admin/network/menu.php

@@ -22 +22 @@
 $submenu['users.php'][10]  = array( _x('Add New', 'user'), 'create_users', 'user-new.php' );
 
-if ( current_user_can( 'update_themes' ) ) {
-    $plugin_update_count = $theme_update_count = $wordpress_update_count = 0;
-    $update_themes = get_site_transient( 'update_themes' );
-    if ( !empty($update_themes->response) )
-        $theme_update_count = count( $update_themes->response );
-    $menu[15] = array(sprintf( __( 'Themes %s' ), "<span class='update-plugins count-$theme_update_count'><span class='theme-count'>" . number_format_i18n( $theme_update_count ) . "</span></span>" ), 'manage_network_themes', 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'div' );
+$update_data = wp_get_update_data();
+
+if ( $update_data['counts']['themes'] ) {
+    $menu[15] = array(sprintf( __( 'Themes %s' ), "<span class='update-plugins count-{$update_data['counts']['themes']}'><span class='theme-count'>" . number_format_i18n( $update_data['counts']['themes'] ) . "</span></span>" ), 'manage_network_themes', 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'div' );
 } else {
     $menu[15] = array( __( 'Themes' ), 'manage_network_themes', 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'div' );
@@ -36 +34 @@
 
 if ( current_user_can( 'update_plugins' ) ) {
-    $update_plugins = get_site_transient( 'update_plugins' );
-    if ( !empty($update_plugins->response) )
-        $plugin_update_count = count( $update_plugins->response );
-    $menu[20] = array( sprintf( __( 'Plugins %s' ), "<span class='update-plugins count-$plugin_update_count'><span class='plugin-count'>" . number_format_i18n( $plugin_update_count ) . "</span></span>" ), 'manage_network_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'div');
+    $menu[20] = array( sprintf( __( 'Plugins %s' ), "<span class='update-plugins count-{$update_data['counts']['plugins']}'><span class='plugin-count'>" . number_format_i18n( $update_data['counts']['plugins'] ) . "</span></span>" ), 'manage_network_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'div');
 } else {
     $menu[20] = array( __('Plugins'), 'manage_network_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'div' );
@@ -54 +49 @@
 }
 
-if ( current_user_can( 'update_core' ) ) {
-    $update_wordpress = get_core_updates( array('dismissed' => false) );
-    if ( !empty($update_wordpress) && !in_array( $update_wordpress[0]->response, array('development', 'latest') ) )
-        $wordpress_update_count = 1;
-    
-    $update_count = $plugin_update_count + $theme_update_count + $wordpress_update_count;
-    $update_title = array();
-    if ( $wordpress_update_count )
-        $update_title[] = sprintf(__('%d WordPress Update'), $wordpress_update_count);
-    if ( $plugin_update_count )
-        $update_title[] = sprintf(_n('%d Plugin Update', '%d Plugin Updates', $plugin_update_count), $plugin_update_count);
-    if ( $theme_update_count )
-        $update_title[] = sprintf(_n('%d Theme Update', '%d Theme Updates', $theme_update_count), $theme_update_count);
-    
-    $update_title = !empty($update_title) ? esc_attr(implode(', ', $update_title)) : '';
-    
-    $menu[30] = 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>" ), 'manage_network', 'upgrade.php', '', 'menu-top menu-icon-tools', 'menu-update', 'div' );
+if ( $update_data['counts']['total'] ) {
+    $menu[30] = array( sprintf( __( 'Updates %s' ), "<span class='update-plugins count-{$update_data['counts']['total']}' title='{$update_data['title']}'><span class='update-count'>" . number_format_i18n($update_data['counts']['total']) . "</span></span>" ), 'manage_network', 'upgrade.php', '', 'menu-top menu-icon-tools', 'menu-update', 'div' );
 } else {
     $menu[30] = array( __( 'Updates' ), 'manage_network', 'upgrade.php', '', 'menu-top menu-icon-tools', 'menu-update', 'div' );
 }
 
+unset($update_data);
+
 $submenu[ 'upgrade.php' ][10] = array( __( 'Available Updates' ), 'update_core',  'update-core.php' );
 $submenu[ 'upgrade.php' ][15] = array( __( 'Update Network' ), 'manage_network', 'upgrade.php' );
-unset($plugin_update_count, $theme_update_count, $wordpress_update_count, $update_count, $update_title, $update_themes, $update_plugins, $update_wordpress);
-
 
 $menu[99] = array( '', 'read', 'separator-last', '', 'wp-menu-separator-last' );