Changes from trunk/wp-admin/menu.php at r18254 to branches/3.1/wp-admin/menu.php at r17432

File:

• branches/3.1/wp-admin/menu.php (modified) (12 diffs)

branches/3.1/wp-admin/menu.php

@@ -25 +25 @@
 $menu[2] = array( __('Dashboard'), 'read', 'index.php', '', 'menu-top menu-top-first menu-icon-dashboard', 'menu-dashboard', 'div' );
 
-$submenu[ 'index.php' ][0] = array( __('Home'), 'read', 'index.php' );
+$submenu[ 'index.php' ][0] = array( __('Dashboard'), 'read', 'index.php' );
 
 if ( is_multisite() ) {
@@ -33 +33 @@
 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;
-    }
+    $update_plugins = get_site_transient( 'update_plugins' );
+    if ( !empty($update_plugins->response) )
+        $plugin_update_count = count( $update_plugins->response );
+    $update_themes = get_site_transient( 'update_themes' );
+    if ( !empty($update_themes->response) )
+        $theme_update_count = count( $update_themes->response );
+    $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;
 
     $total_update_count = $plugin_update_count + $theme_update_count + $wordpress_update_count;
@@ -59 +50 @@
         $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[] = sprintf(_n('%d Theme Update', '%d Themes Updates', $theme_update_count), $theme_update_count);
 
     $update_title = !empty($update_title) ? esc_attr(implode(', ', $update_title)) : '';
@@ -68 +59 @@
 }
 
-unset($theme_update_count, $wordpress_update_count, $update_themes, $update_plugins, $update_wordpress);
+unset($plugin_update_count, $theme_update_count, $wordpress_update_count, $update_themes, $update_plugins, $update_wordpress);
 
 $menu[4] = array( '', 'read', 'separator1', '', 'wp-menu-separator' );
 
 $menu[5] = array( __('Posts'), 'edit_posts', 'edit.php', '', 'open-if-no-js menu-top menu-icon-post', 'menu-posts', 'div' );
-    $submenu['edit.php'][5]  = array( __('All Posts'), 'edit_posts', 'edit.php' );
+    $submenu['edit.php'][5]  = array( __('Posts'), 'edit_posts', 'edit.php' );
     /* translators: add new post */
     $submenu['edit.php'][10]  = array( _x('Add New', 'post'), 'edit_posts', 'post-new.php' );
@@ -92 +83 @@
 
 $menu[15] = array( __('Links'), 'manage_links', 'link-manager.php', '', 'menu-top menu-icon-links', 'menu-links', 'div' );
-    $submenu['link-manager.php'][5] = array( __('All Links'), 'manage_links', 'link-manager.php' );
+    $submenu['link-manager.php'][5] = array( __('Links'), 'manage_links', 'link-manager.php' );
     /* translators: add new links */
     $submenu['link-manager.php'][10] = array( _x('Add New', 'link'), 'manage_links', 'link-add.php' );
@@ -98 +89 @@
 
 $menu[20] = array( __('Pages'), 'edit_pages', 'edit.php?post_type=page', '', 'menu-top menu-icon-page', 'menu-pages', 'div' );
-    $submenu['edit.php?post_type=page'][5] = array( __('All Pages'), 'edit_pages', 'edit.php?post_type=page' );
+    $submenu['edit.php?post_type=page'][5] = array( __('Pages'), 'edit_pages', 'edit.php?post_type=page' );
     /* translators: add new page */
     $submenu['edit.php?post_type=page'][10] = array( _x('Add New', 'page'), 'edit_pages', 'post-new.php?post_type=page' );
@@ -112 +103 @@
 $awaiting_mod = wp_count_comments();
 $awaiting_mod = $awaiting_mod->moderated;
-$menu[25] = array( sprintf( __('Comments %s'), "<span class='awaiting-mod count-$awaiting_mod'><span class='pending-count'>" . number_format_i18n($awaiting_mod) . "</span></span>" ), 'edit_posts', 'edit-comments.php', '', 'menu-top menu-icon-comments', 'menu-comments', 'div' );
+$menu[25] = array( sprintf( __('Comments %s'), "<span id='awaiting-mod' class='count-$awaiting_mod'><span class='pending-count'>" . number_format_i18n($awaiting_mod) . "</span></span>" ), 'edit_posts', 'edit-comments.php', '', 'menu-top menu-icon-comments', 'menu-comments', 'div' );
 unset($awaiting_mod);
-
-$submenu[ 'edit-comments.php' ][0] = array( __('All Comments'), 'edit_posts', 'edit-comments.php' );
 
 $_wp_last_object_menu = 25; // The index of the last top-level menu in the object menu group
@@ -140 +129 @@
 
     $menu[$ptype_menu_position] = array( esc_attr( $ptype_obj->labels->menu_name ), $ptype_obj->cap->edit_posts, "edit.php?post_type=$ptype", '', 'menu-top menu-icon-' . $ptype_class, 'menu-posts-' . $ptype_for_id, $menu_icon );
-    $submenu["edit.php?post_type=$ptype"][5]  = array( $ptype_obj->labels->all_items, $ptype_obj->cap->edit_posts,  "edit.php?post_type=$ptype");
+    $submenu["edit.php?post_type=$ptype"][5]  = array( $ptype_obj->labels->menu_name, $ptype_obj->cap->edit_posts,  "edit.php?post_type=$ptype");
     $submenu["edit.php?post_type=$ptype"][10]  = array( $ptype_obj->labels->add_new, $ptype_obj->cap->edit_posts, "post-new.php?post_type=$ptype" );
 
@@ -175 +164 @@
 }
 
-$menu_perms = get_site_option( 'menu_items', array() );
+$update_plugins = get_site_transient( 'update_plugins' );
+$update_count = 0;
+if ( !empty($update_plugins->response) )
+    $update_count = count( $update_plugins->response );
+
+$menu_perms = get_site_option('menu_items', array());
 if ( ! is_multisite() || is_super_admin() || ! empty( $menu_perms['plugins'] ) ) {
-    $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_count'><span class='plugin-count'>" . number_format_i18n($update_count) . "</span></span>";
+    if ( is_multisite() )
+        $count = '';
     $menu[65] = array( sprintf( __('Plugins %s'), $count ), 'activate_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'div' );
-
-    $submenu['plugins.php'][5]  = array( __('Installed Plugins'), 'activate_plugins', 'plugins.php' );
-
         if ( ! is_multisite() ) {
             /* translators: add new plugin */
+            $submenu['plugins.php'][5]  = array( __('Plugins'), 'activate_plugins', 'plugins.php' );
             $submenu['plugins.php'][10] = array( _x('Add New', 'plugin'), 'install_plugins', 'plugin-install.php' );
             $submenu['plugins.php'][15] = array( _x('Editor', 'plugin editor'), 'edit_plugins', 'plugin-editor.php' );
         }
 }
-unset($menu_perms, $update_plugins, $plugin_update_count);
+unset($menu_perms, $update_plugins, $update_count);
 
 if ( current_user_can('list_users') )
@@ -200 +191 @@
 if ( current_user_can('list_users') ) {
     $_wp_real_parent_file['profile.php'] = 'users.php'; // Back-compat for plugins adding submenus to profile.php.
-    $submenu['users.php'][5] = array(__('All Users'), 'list_users', 'users.php');
+    $submenu['users.php'][5] = array(__('Users'), 'list_users', 'users.php');
     if ( current_user_can('create_users') )
         $submenu['users.php'][10] = array(_x('Add New', 'user'), 'create_users', 'user-new.php');
@@ -217 +208 @@
 
 $menu[75] = array( __('Tools'), 'edit_posts', 'tools.php', '', 'menu-top menu-icon-tools', 'menu-tools', 'div' );
-    $submenu['tools.php'][5] = array( __('Available Tools'), 'edit_posts', 'tools.php' );
+    $submenu['tools.php'][5] = array( __('Tools'), 'edit_posts', 'tools.php' );
     $submenu['tools.php'][10] = array( __('Import'), 'import', 'import.php' );
-    $submenu['tools.php'][15] = array( __('Export'), 'export', 'export.php' );
+    $submenu['tools.php'][15] = array( __('Export'), 'import', 'export.php' );
     if ( is_multisite() && !is_main_site() )
         $submenu['tools.php'][25] = array( __('Delete Site'), 'manage_options', 'ms-delete-site.php' );
     if ( ! is_multisite() && defined('WP_ALLOW_MULTISITE') && WP_ALLOW_MULTISITE )
-        $submenu['tools.php'][50] = array(__('Network Setup'), 'manage_options', 'network.php');
+        $submenu['tools.php'][50] = array(__('Network'), 'manage_options', 'network.php');
 
 $menu[80] = array( __('Settings'), 'manage_options', 'options-general.php', '', 'menu-top menu-icon-settings', 'menu-settings', 'div' );
@@ -236 +227 @@
 $_wp_last_utility_menu = 80; // The index of the last top-level menu in the utility menu group
 
-$menu[99] = array( '', 'read', 'separator-last', '', 'wp-menu-separator' );
+$menu[99] = array( '', 'read', 'separator-last', '', 'wp-menu-separator-last' );
 
 // Back-compat for old top-levels