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

Timestamp:

10/14/2008 10:44:56 PM (17 years ago)

Author:

ryan

Message:

Menu fixes

File:

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

trunk/wp-admin/menu.php

@@ -25 +25 @@
 $awaiting_mod = $awaiting_mod->moderated;
 
-$menu[0] = array( __('Dashboard'), 'read', 'index.php', 'wp-menu-open', 'menu-dashboard', 'images/menu/home.png' );
+$menu[0] = array( __('Dashboard'), 'read', 'index.php', '', 'wp-menu-open', 'menu-dashboard', 'images/menu/home.png' );
     $submenu['index.php'][5]  = array( __('Dashboard'), 'read' , 'index.php' );
 
-$menu[4] = array( '', 'read', '', 'wp-menu-separator' );
+$menu[4] = array( '', 'read', '', '', 'wp-menu-separator' );
 
-$menu[5] = array( __('Posts'), 'edit_posts', 'post-new.php', 'wp-menu-open', 'menu-posts', 'images/menu/posts.png' );
+$menu[5] = array( __('Posts'), 'edit_posts', 'post-new.php', '', 'wp-menu-open', 'menu-posts', 'images/menu/posts.png' );
     $submenu['post-new.php'][5]  = array( __('Add New'), 'edit_posts', 'post-new.php' );
     //$submenu['post-new.php'][10]  = array( __('Drafts'), 'edit_posts', 'edit-post-drafts.php' );
@@ -37 +37 @@
     $submenu['post-new.php'][25] = array( __('Categories'), 'manage_categories', 'categories.php' );
 
-$menu[10] = array( __('Media'), 'upload_files', 'media-new.php', '', 'menu-media', 'images/menu/media.png' );
+$menu[10] = array( __('Media'), 'upload_files', 'media-new.php', '', '', 'menu-media', 'images/menu/media.png' );
     $submenu['media-new.php'][5] = array( __('Add New'), 'upload_files', 'media-new.php');
     $submenu['media-new.php'][10] = array( __('Edit'), 'upload_files', 'upload.php');
 
-$menu[15] = array( __('Links'), 'manage_links', 'link-add.php', '', 'menu-links', 'images/menu/links.png' );
+$menu[15] = array( __('Links'), 'manage_links', 'link-add.php', '', '', 'menu-links', 'images/menu/links.png' );
     $submenu['link-add.php'][5] = array( __('Add New'), 'manage_links', 'link-add.php' );
     $submenu['link-add.php'][10] = array( __('Edit'), 'manage_links', 'link-manager.php' );
     $submenu['link-add.php'][15] = array( __('Link Categories'), 'manage_categories', 'edit-link-categories.php' );
 
-$menu[20] = array( __('Pages'), 'edit_pages', 'page-new.php', '', 'menu-pages', 'images/menu/pages.png' );
+$menu[20] = array( __('Pages'), 'edit_pages', 'page-new.php', '', '', 'menu-pages', 'images/menu/pages.png' );
     $submenu['page-new.php'][5] = array( __('Add New'), 'edit_pages', 'page-new.php' );
     //$submenu['page-new.php'][10] = array( __('Drafts'), 'edit_pages', 'edit-page-drafts.php' );
     $submenu['page-new.php'][15] = array( __('Edit'), 'edit_pages', 'edit-pages.php' );
 
-$menu[25] = array( __('Comments'), 'edit_posts', 'edit-comments.php', '', 'menu-comments', 'images/menu/comments.png' );
+$menu[25] = array( __('Comments'), 'edit_posts', 'edit-comments.php', '', '', 'menu-comments', 'images/menu/comments.png' );
     $submenu['edit-comments.php'][15] = array( __('Comments'), 'edit_posts', 'edit-comments.php' );
 
-$menu[29] = array( '', 'read', '', 'wp-menu-separator' );
+$menu[29] = array( '', 'read', '', '', 'wp-menu-separator' );
 
-$menu[30] = array( __('Appearance'), 'switch_themes', 'themes.php', '', 'menu-appearance', 'images/menu/appearance.png' );
+$menu[30] = array( __('Appearance'), 'switch_themes', 'themes.php', '', '', 'menu-appearance', 'images/menu/appearance.png' );
     $submenu['themes.php'][5]  = array(__('Themes'), 'switch_themes', 'themes.php');
     $submenu['themes.php'][10] = array(__('Editor'), 'edit_themes', 'theme-editor.php');
 
-$menu[35] = array( __('Plugins'), 'activate_plugins', 'plugins.php', '', 'menu-plugins', 'images/menu/plugins.png' );
+$menu[35] = array( __('Plugins'), 'activate_plugins', 'plugins.php', '', '', 'menu-plugins', 'images/menu/plugins.png' );
     $submenu['plugins.php'][15] = array(__('Add New'), 'install_plugins', 'plugin-install.php');    
     $submenu['plugins.php'][5]  = array( __('Installed'), 'activate_plugins', 'plugins.php' );
@@ -66 +66 @@
 
 if ( current_user_can('edit_users') )
-    $menu[40] = array( __('Users'), 'edit_users', 'users.php', '', 'menu-users', 'images/menu/users.png' );
+    $menu[40] = array( __('Users'), 'edit_users', 'users.php', '', '', 'menu-users', 'images/menu/users.png' );
 else
-    $menu[40] = array( __('Profile'), 'read', 'profile.php', '', 'menu-users', 'images/menu/users.png' );
+    $menu[40] = array( __('Profile'), 'read', 'profile.php', '', '', 'menu-users', 'images/menu/users.png' );
 
 if ( current_user_can('edit_users') ) {
@@ -79 +79 @@
 }
 
-$menu[45] = array( __('Tools'), 'manage_options', 'import.php', '', 'menu-tools', 'images/menu/tools.png' );
+$menu[45] = array( __('Tools'), 'manage_options', 'import.php', '', '', 'menu-tools', 'images/menu/tools.png' );
     $submenu['import.php'][5] = array( __('Import'), 'import', 'import.php' );
     $submenu['import.php'][10] = array( __('Export'), 'import', 'export.php' );
@@ -86 +86 @@
         $submenu['import.php'][20] = array( __('Turbo'), 'read', 'turbo.php' );
 
-$menu[50] = array( __('Settings'), 'manage_options', 'options-general.php', '', 'menu-settings', 'images/menu/settings.png' );
+$menu[50] = array( __('Settings'), 'manage_options', 'options-general.php', '', '', 'menu-settings', 'images/menu/settings.png' );
     $submenu['options-general.php'][10] = array(__('General'), 'manage_options', 'options-general.php');
     $submenu['options-general.php'][15] = array(__('Writing'), 'manage_options', 'options-writing.php');
@@ -163 +163 @@
             $_wp_menu_nopriv[$data[2]] = true;
             unset($menu[$id]);
+        } elseif ( !empty($data[0]) ) {
+            $submenu[$data[2]][0] = $data;
         }
     }