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

Timestamp:

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

Author:

ryan

Message:

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

File:

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

trunk/wp-admin/menu.php

@@ -31 +31 @@
 }
 
-if ( ! is_multisite() || is_super_admin() ) {
-    $plugin_update_count = $theme_update_count = $wordpress_update_count = 0;
-
-    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 );
-    }
-
-    if ( current_user_can( 'update_themes' ) ) {
-        $update_themes = get_site_transient( 'update_themes' );
-        if ( !empty($update_themes->response) )
-            $theme_update_count = count( $update_themes->response );
-    }
-
-    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') ) && current_user_can('update_core') )
-            $wordpress_update_count = 1;
-    }
-
-    $total_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)) : '';
-}
+if ( ! is_multisite() || is_super_admin() )
+    $update_data = wp_get_update_data();
 
 if ( ! is_multisite() ) {
-    $submenu[ 'index.php' ][10] = array( sprintf( __('Updates %s'), "<span class='update-plugins count-$total_update_count' title='$update_title'><span class='update-count'>" . number_format_i18n($total_update_count) . "</span></span>" ), 'update_core',  'update-core.php');
-}
-
-unset($theme_update_count, $wordpress_update_count, $update_themes, $update_plugins, $update_wordpress);
+    $submenu[ 'index.php' ][10] = 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>" ), 'update_core',  'update-core.php');
+}
 
 $menu[4] = array( '', 'read', 'separator1', '', 'wp-menu-separator' );
@@ -177 +145 @@
 $menu_perms = get_site_option( 'menu_items', array() );
 if ( ! is_multisite() || is_super_admin() || ! empty( $menu_perms['plugins'] ) ) {
+    if ( ! isset( $update_data ) )
+        $update_data = wp_get_update_data();
+
     $count = '';
     if ( ! is_multisite() && current_user_can( 'update_plugins' ) )
-        $count = "<span class='update-plugins count-$plugin_update_count'><span class='plugin-count'>" . number_format_i18n($plugin_update_count) . "</span></span>";
+        $count = "<span class='update-plugins count-{$update_data['counts']['plugins']}'><span class='plugin-count'>" . number_format_i18n($update_data['counts']['plugins']) . "</span></span>";
 
     $menu[65] = array( sprintf( __('Plugins %s'), $count ), 'activate_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'div' );
@@ -191 +162 @@
         }
 }
-unset($menu_perms, $update_plugins, $plugin_update_count);
+unset($menu_perms, $update_data);
 
 if ( current_user_can('list_users') )