Index: src/wp-admin/menu.php
===================================================================
--- src/wp-admin/menu.php	(revision 33640)
+++ src/wp-admin/menu.php	(working copy)
@@ -17,255 +17,476 @@
  *     4: ID
  *     5: Icon for top level menu
  *
+ * This class exposes the following globals $dynamically
+ *
  * @global array $menu
+ * @global array $submenu
+ * @global array $_wp_real_parent_file
+ * @global array $compat
+ * @global int   $_wp_last_object_menu
+ * @global int   $_wp_last_utility_menu
  */
+class WP_Admin_Menu {
+	public $menu;
+	public $submenu;
+	public $_wp_real_parent_file = array();
+	public $compat;
+	// The index of the last top-level menu in the object menu group
+	public $_wp_last_object_menu = 25;
+	// The index of the last top-level menu in the utility menu group
+	public $_wp_last_utility_menu = 80;
 
-$menu[2] = array( __('Dashboard'), 'read', 'index.php', '', 'menu-top menu-top-first menu-icon-dashboard', 'menu-dashboard', 'dashicons-dashboard' );
+	private $appearance_cap;
+	private $update_data;
 
-$submenu[ 'index.php' ][0] = array( __('Home'), 'read', 'index.php' );
+	public function __construct( $export = true ) {
+		$this->appearance_cap = current_user_can( 'switch_themes' ) ? 'switch_themes' : 'edit_theme_options';
+		$this->update_data = wp_get_update_data();
 
-if ( is_multisite() ) {
-	$submenu[ 'index.php' ][5] = array( __('My Sites'), 'read', 'my-sites.php' );
-}
+		$this->compat = $this->get_compat();
+		$this->_wp_real_parent_file = $this->get_top_level_back_compat();
 
-if ( ! is_multisite() || is_super_admin() )
-	$update_data = wp_get_update_data();
+		$this->menu = $this->get_top_level();
 
-if ( ! is_multisite() ) {
-	if ( current_user_can( 'update_core' ) )
-		$cap = 'update_core';
-	elseif ( current_user_can( 'update_plugins' ) )
-		$cap = 'update_plugins';
-	else
-		$cap = 'update_themes';
-	$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>" ), $cap, 'update-core.php');
-	unset( $cap );
-}
+		foreach ( $this->menu as $top_level ) {
+			// [2] is URL, example: index.php
+			$this->add_submenu( $top_level[2] );
+		}
 
-$menu[4] = array( '', 'read', 'separator1', '', 'wp-menu-separator' );
+		$this->add_post_type_menus();
 
-$menu[5] = array( __('Posts'), 'edit_posts', 'edit.php', '', 'open-if-no-js menu-top menu-icon-post', 'menu-posts', 'dashicons-admin-post' );
-	$submenu['edit.php'][5]  = array( __('All Posts'), 'edit_posts', 'edit.php' );
-	/* translators: add new post */
-	$submenu['edit.php'][10]  = array( _x('Add New', 'post'), get_post_type_object( 'post' )->cap->create_posts, 'post-new.php' );
+		if ( $export ) {
+			$this->export();
+		}
+	}
 
-	$i = 15;
-	foreach ( get_taxonomies( array(), 'objects' ) as $tax ) {
-		if ( ! $tax->show_ui || ! $tax->show_in_menu || ! in_array('post', (array) $tax->object_type, true) )
-			continue;
+	public function export() {
+		$vars = get_object_vars( $this );
+		foreach ( $vars as $var => $value ) {
+			$GLOBALS[ $var ] = $value;
+		}
+	}
 
-		$submenu['edit.php'][$i++] = array( esc_attr( $tax->labels->menu_name ), $tax->cap->manage_terms, 'edit-tags.php?taxonomy=' . $tax->name );
+	public function get_top_level() {
+		$comment_count = wp_count_comments();
+		$count = '';
+		if ( ! is_multisite() || ( is_super_admin() || current_user_can( 'update_plugins' ) ) ) {
+			$count = "<span class='update-plugins count-{$this->update_data['counts']['plugins']}'><span class='plugin-count'>" .
+				number_format_i18n($this->update_data['counts']['plugins']) .
+			"</span></span>";
+		}
+
+		$comments_name = sprintf(
+			__( 'Comments %s' ),
+			"<span class='awaiting-mod count-{$comment_count->moderated}'><span class='pending-count'>" .
+					number_format_i18n( $comment_count->moderated ) .
+			"</span></span>"
+		);
+
+		$menu = array(
+			2  => array( __( 'Dashboard' ), 'read', 'index.php', '', 'menu-top menu-top-first menu-icon-dashboard', 'menu-dashboard', 'dashicons-dashboard' ),
+			4  => array( '', 'read', 'separator1', '', 'wp-menu-separator' ),
+			5  => array( __( 'Posts' ), 'edit_posts', 'edit.php', '', 'open-if-no-js menu-top menu-icon-post', 'menu-posts', 'dashicons-admin-post' ),
+			10 => array( __( 'Media' ), 'upload_files', 'upload.php', '', 'menu-top menu-icon-media', 'menu-media', 'dashicons-admin-media' ),
+			15 => array( __( 'Links' ), 'manage_links', 'link-manager.php', '', 'menu-top menu-icon-links', 'menu-links', 'dashicons-admin-links' ),
+			20 => array( __( 'Pages' ), 'edit_pages', 'edit.php?post_type=page', '', 'menu-top menu-icon-page', 'menu-pages', 'dashicons-admin-page' ),
+			25 => array( $comments_name, 'edit_posts', 'edit-comments.php', '', 'menu-top menu-icon-comments', 'menu-comments', 'dashicons-admin-comments' ),
+			59 => array( '', 'read', 'separator2', '', 'wp-menu-separator' ),
+			60 => array( __( 'Appearance' ), $this->appearance_cap, 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'dashicons-admin-appearance' ),
+			65 => array( sprintf( __( 'Plugins %s' ), $count ), 'activate_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'dashicons-admin-plugins' ),
+			75 => array( __( 'Tools' ), 'edit_posts', 'tools.php', '', 'menu-top menu-icon-tools', 'menu-tools', 'dashicons-admin-tools' ),
+			80 => array( __( 'Settings' ), 'manage_options', 'options-general.php', '', 'menu-top menu-icon-settings', 'menu-settings', 'dashicons-admin-settings' ),
+			99 => array( '', 'read', 'separator-last', '', 'wp-menu-separator' ),
+		);
+
+		if ( current_user_can( 'list_users' ) ) {
+			$menu[70] = array( __( 'Users' ), 'list_users', 'users.php', '', 'menu-top menu-icon-users', 'menu-users', 'dashicons-admin-users' );
+		} else {
+			$menu[70] = array( __( 'Profile' ), 'read', 'profile.php', '', 'menu-top menu-icon-users', 'menu-users', 'dashicons-admin-users' );
+		}
+
+		return $menu;
 	}
-	unset($tax);
 
-$menu[10] = array( __('Media'), 'upload_files', 'upload.php', '', 'menu-top menu-icon-media', 'menu-media', 'dashicons-admin-media' );
-	$submenu['upload.php'][5] = array( __('Library'), 'upload_files', 'upload.php');
-	/* translators: add new file */
-	$submenu['upload.php'][10] = array( _x('Add New', 'file'), 'upload_files', 'media-new.php');
-	foreach ( get_taxonomies_for_attachments( 'objects' ) as $tax ) {
-		if ( ! $tax->show_ui || ! $tax->show_in_menu )
-			continue;
+	public function get_index_submenu() {
+		$submenu = array(
+			0 => array( __( 'Home' ), 'read', 'index.php' ),
+		);
 
-		$submenu['upload.php'][$i++] = array( esc_attr( $tax->labels->menu_name ), $tax->cap->manage_terms, 'edit-tags.php?taxonomy=' . $tax->name . '&amp;post_type=attachment' );
+		if ( is_multisite() ) {
+			$submenu[5] = array( __( 'My Sites' ), 'read', 'my-sites.php' );
+		} else {
+			if ( current_user_can( 'update_core' ) ) {
+				$cap = 'update_core';
+			} elseif ( current_user_can( 'update_plugins' ) ) {
+				$cap = 'update_plugins';
+			} else {
+				$cap = 'update_themes';
+			}
+			$name = sprintf(
+				__( 'Updates %s' ),
+				"<span class='update-plugins count-{$this->update_data['counts']['total']}' title='{$this->update_data['title']}'><span class='update-count'>" .
+					number_format_i18n($this->update_data['counts']['total']) .
+				"</span></span>"
+			);
+			$submenu[10] = array( $name, $cap, 'update-core.php' );
+		}
+
+		return $submenu;
 	}
-	unset($tax);
 
-$menu[15] = array( __('Links'), 'manage_links', 'link-manager.php', '', 'menu-top menu-icon-links', 'menu-links', 'dashicons-admin-links' );
-	$submenu['link-manager.php'][5] = array( _x('All Links', 'admin menu'), 'manage_links', 'link-manager.php' );
-	/* translators: add new links */
-	$submenu['link-manager.php'][10] = array( _x('Add New', 'link'), 'manage_links', 'link-add.php' );
-	$submenu['link-manager.php'][15] = array( __('Link Categories'), 'manage_categories', 'edit-tags.php?taxonomy=link_category' );
+	public function get_post_submenu() {
+		$submenu = array(
+			5 => array( __( 'All Posts' ), 'edit_posts', 'edit.php' ),
+			/* translators: add new post */
+			10 => array( _x( 'Add New', 'post' ), get_post_type_object( 'post' )->cap->create_posts, 'post-new.php' ),
+		);
 
-$menu[20] = array( __('Pages'), 'edit_pages', 'edit.php?post_type=page', '', 'menu-top menu-icon-page', 'menu-pages', 'dashicons-admin-page' );
-	$submenu['edit.php?post_type=page'][5] = array( __('All Pages'), 'edit_pages', 'edit.php?post_type=page' );
-	/* translators: add new page */
-	$submenu['edit.php?post_type=page'][10] = array( _x('Add New', 'page'), get_post_type_object( 'page' )->cap->create_posts, 'post-new.php?post_type=page' );
-	$i = 15;
-	foreach ( get_taxonomies( array(), 'objects' ) as $tax ) {
-		if ( ! $tax->show_ui || ! $tax->show_in_menu  || ! in_array('page', (array) $tax->object_type, true) )
-			continue;
+		$i = 15;
+		foreach ( get_taxonomies( array(), 'objects' ) as $tax ) {
+			if ( ! $tax->show_ui || ! $tax->show_in_menu || ! in_array( 'post', (array) $tax->object_type, true ) ) {
+				continue;
+			}
+			$submenu[ $i++ ] = array(
+				esc_attr( $tax->labels->menu_name ),
+				$tax->cap->manage_terms,
+				'edit-tags.php?taxonomy=' . $tax->name
+			);
+		}
 
-		$submenu['edit.php?post_type=page'][$i++] = array( esc_attr( $tax->labels->menu_name ), $tax->cap->manage_terms, 'edit-tags.php?taxonomy=' . $tax->name . '&amp;post_type=page' );
+		return $submenu;
 	}
-	unset($tax);
 
-$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', 'dashicons-admin-comments' );
-unset($awaiting_mod);
+	public function get_upload_submenu() {
+		$submenu = array(
+			5  => array( __( 'Library' ), 'upload_files', 'upload.php' ),
+			/* translators: add new file */
+			10 => array( _x( 'Add New', 'file' ), 'upload_files', 'media-new.php' ),
+		);
 
-$submenu[ 'edit-comments.php' ][0] = array( __('All Comments'), 'edit_posts', 'edit-comments.php' );
+		$i = 15;
+		foreach ( get_taxonomies_for_attachments( 'objects' ) as $tax ) {
+			if ( ! $tax->show_ui || ! $tax->show_in_menu ) {
+				continue;
+			}
 
-$_wp_last_object_menu = 25; // The index of the last top-level menu in the object menu group
+			$submenu[ $i++ ] = array(
+				esc_attr( $tax->labels->menu_name ),
+				$tax->cap->manage_terms,
+				'edit-tags.php?taxonomy=' . $tax->name . '&amp;post_type=attachment'
+			);
+		}
 
-foreach ( (array) get_post_types( array('show_ui' => true, '_builtin' => false, 'show_in_menu' => true ) ) as $ptype ) {
-	$ptype_obj = get_post_type_object( $ptype );
-	// Check if it should be a submenu.
-	if ( $ptype_obj->show_in_menu !== true )
-		continue;
-	$ptype_menu_position = is_int( $ptype_obj->menu_position ) ? $ptype_obj->menu_position : ++$_wp_last_object_menu; // If we're to use $_wp_last_object_menu, increment it first.
-	$ptype_for_id = sanitize_html_class( $ptype );
+		return $submenu;
+	}
 
-	if ( is_string( $ptype_obj->menu_icon ) ) {
-		// Special handling for data:image/svg+xml and Dashicons.
-		if ( 0 === strpos( $ptype_obj->menu_icon, 'data:image/svg+xml;base64,' ) || 0 === strpos( $ptype_obj->menu_icon, 'dashicons-' ) ) {
-			$menu_icon = $ptype_obj->menu_icon;
-		} else {
-			$menu_icon = esc_url( $ptype_obj->menu_icon );
+	public function get_link_manager_submenu() {
+		return array(
+			5  => array( _x( 'All Links', 'admin menu' ), 'manage_links', 'link-manager.php' ),
+			/* translators: add new links */
+			10 => array( _x( 'Add New', 'link' ), 'manage_links', 'link-add.php' ),
+			15 => array( __( 'Link Categories' ), 'manage_categories', 'edit-tags.php?taxonomy=link_category' ),
+		);
+	}
+
+	public function get_page_submenu() {
+		$submenu = array(
+			5  => array( __( 'All Pages' ), 'edit_pages', 'edit.php?post_type=page' ),
+			/* translators: add new page */
+			10 => array( _x( 'Add New', 'page' ), get_post_type_object( 'page' )->cap->create_posts, 'post-new.php?post_type=page' ),
+		);
+
+		$i = 15;
+		foreach ( get_taxonomies( array(), 'objects' ) as $tax ) {
+			if ( ! $tax->show_ui || ! $tax->show_in_menu  || ! in_array('page', (array) $tax->object_type, true ) ) {
+				continue;
+			}
+
+			$submenu[ $i++ ] = array(
+				esc_attr( $tax->labels->menu_name ),
+				$tax->cap->manage_terms,
+				'edit-tags.php?taxonomy=' . $tax->name . '&amp;post_type=page'
+			);
 		}
-		$ptype_class = $ptype_for_id;
-	} else {
-		$menu_icon   = 'dashicons-admin-post';
-		$ptype_class = 'post';
+
+		return $submenu;
 	}
 
-	/*
-	 * If $ptype_menu_position is already populated or will be populated
-	 * by a hard-coded value below, increment the position.
-	 */
-	$core_menu_positions = array(59, 60, 65, 70, 75, 80, 85, 99);
-	while ( isset($menu[$ptype_menu_position]) || in_array($ptype_menu_position, $core_menu_positions) )
-		$ptype_menu_position++;
+	public function get_comment_submenu() {
+		return array(
+			0 => array( __( 'All Comments' ), 'edit_posts', 'edit-comments.php' ),
+		);
+	}
 
-	$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"][10]  = array( $ptype_obj->labels->add_new, $ptype_obj->cap->create_posts, "post-new.php?post_type=$ptype" );
+	public function get_theme_submenu() {
+		$customize_url = add_query_arg( 'return', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), 'customize.php' );
 
-	$i = 15;
-	foreach ( get_taxonomies( array(), 'objects' ) as $tax ) {
-		if ( ! $tax->show_ui || ! $tax->show_in_menu || ! in_array($ptype, (array) $tax->object_type, true) )
-			continue;
+		$submenu = array(
+			5 => array( __( 'Themes' ), $this->appearance_cap, 'themes.php' ),
+			6 => array( __( 'Customize' ), 'customize', esc_url( $customize_url ), '', 'hide-if-no-customize' ),
+		);
 
-		$submenu["edit.php?post_type=$ptype"][$i++] = array( esc_attr( $tax->labels->menu_name ), $tax->cap->manage_terms, "edit-tags.php?taxonomy=$tax->name&amp;post_type=$ptype" );
+		if ( current_theme_supports( 'menus' ) || current_theme_supports( 'widgets' ) ) {
+			$submenu[10] = array( __( 'Menus' ), 'edit_theme_options', 'nav-menus.php' );
+		}
+
+		if ( current_theme_supports( 'custom-header' ) && current_user_can( 'customize') ) {
+			$customize_header_url = add_query_arg( array( 'autofocus' => array( 'control' => 'header_image' ) ), $customize_url );
+			$submenu[15] = array( __( 'Header' ), $this->appearance_cap, esc_url( $customize_header_url ), '', 'hide-if-no-customize' );
+		}
+
+		if ( current_theme_supports( 'custom-background' ) && current_user_can( 'customize') ) {
+			$customize_background_url = add_query_arg( array( 'autofocus' => array( 'control' => 'background_image' ) ), $customize_url );
+			$submenu[20] = array( __( 'Background' ), $this->appearance_cap, esc_url( $customize_background_url ), '', 'hide-if-no-customize' );
+		}
+
+		if ( ! is_multisite() ) {
+			// Add 'Editor' to the bottom of the Appearance menu.
+			add_action( 'admin_menu', '_add_themes_utility_last', 101 );
+		}
+
+		return $submenu;
 	}
-}
-unset($ptype, $ptype_obj, $ptype_class, $ptype_for_id, $ptype_menu_position, $menu_icon, $i, $tax);
 
-$menu[59] = array( '', 'read', 'separator2', '', 'wp-menu-separator' );
+	public function get_plugin_submenu() {
+		$submenu = array(
+			5 => array( __( 'Installed Plugins' ), 'activate_plugins', 'plugins.php' )
+		);
 
-$appearance_cap = current_user_can( 'switch_themes') ? 'switch_themes' : 'edit_theme_options';
+		if ( ! is_multisite() ) {
+			/* translators: add new plugin */
+			$submenu[10] = array( _x( 'Add New', 'plugin' ), 'install_plugins', 'plugin-install.php' );
+			$submenu[15] = array( _x( 'Editor', 'plugin editor' ), 'edit_plugins', 'plugin-editor.php' );
+		}
+		return $submenu;
+	}
 
-$menu[60] = array( __( 'Appearance' ), $appearance_cap, 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'dashicons-admin-appearance' );
-	$submenu['themes.php'][5] = array( __( 'Themes' ), $appearance_cap, 'themes.php' );
+	public function get_tools_submenu() {
+		$submenu = array(
+			5  => array( __( 'Available Tools' ), 'edit_posts', 'tools.php' ),
+			10 => array( __( 'Import' ), 'import', 'import.php' ),
+			15 => array( __( 'Export' ), 'export', 'export.php' ),
+		);
 
-	$customize_url = add_query_arg( 'return', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), 'customize.php' );
-	$submenu['themes.php'][6] = array( __( 'Customize' ), 'customize', esc_url( $customize_url ), '', 'hide-if-no-customize' );
+		if ( is_multisite() ) {
+			if ( ! is_main_site() ) {
+				$submenu[25] = array( __( 'Delete Site' ), 'delete_site', 'ms-delete-site.php' );
+			}
+		} else  {
+			if ( defined( 'WP_ALLOW_MULTISITE' ) && WP_ALLOW_MULTISITE ) {
+				$submenu[50] = array( __( 'Network Setup' ), 'manage_options', 'network.php' );
+			}
+		}
 
-	if ( current_theme_supports( 'menus' ) || current_theme_supports( 'widgets' ) ) {
-		$submenu['themes.php'][10] = array( __( 'Menus' ), 'edit_theme_options', 'nav-menus.php' );
+		return $submenu;
 	}
 
-	if ( current_theme_supports( 'custom-header' ) && current_user_can( 'customize') ) {
-		$customize_header_url = add_query_arg( array( 'autofocus' => array( 'control' => 'header_image' ) ), $customize_url );
-		$submenu['themes.php'][15] = array( __( 'Header' ), $appearance_cap, esc_url( $customize_header_url ), '', 'hide-if-no-customize' );
+	public function get_options_submenu() {
+		return array(
+			10 => array( _x( 'General', 'settings screen' ), 'manage_options', 'options-general.php' ),
+			15 => array( __( 'Writing' ), 'manage_options', 'options-writing.php' ),
+			20 => array( __( 'Reading' ), 'manage_options', 'options-reading.php' ),
+			25 => array( __( 'Discussion' ), 'manage_options', 'options-discussion.php' ),
+			30 => array( __( 'Media' ), 'manage_options', 'options-media.php' ),
+			40 => array( __( 'Permalinks' ), 'manage_options', 'options-permalink.php' ),
+		);
 	}
 
-	if ( current_theme_supports( 'custom-background' ) && current_user_can( 'customize') ) {
-		$customize_background_url = add_query_arg( array( 'autofocus' => array( 'control' => 'background_image' ) ), $customize_url );
-		$submenu['themes.php'][20] = array( __( 'Background' ), $appearance_cap, esc_url( $customize_background_url ), '', 'hide-if-no-customize' );
+	public function get_user_submenu() {
+		$submenu = array(
+			5  => array( __( 'All Users' ), 'list_users', 'users.php' ),
+			15 => array( __( 'Your Profile' ), 'read', 'profile.php' )
+		);
+
+		if ( current_user_can( 'create_users' ) ) {
+			$submenu[10] = array( _x( 'Add New', 'user' ), 'create_users', 'user-new.php' );
+		} elseif ( is_multisite() ) {
+			$submenu[10] = array( _x( 'Add New', 'user' ), 'promote_users', 'user-new.php' );
+		}
+
+		return $submenu;
 	}
 
-	unset( $customize_url );
+	public function get_profile_submenu() {
+		$submenu = array(
+			5 => array( __( 'Your Profile' ), 'read', 'profile.php' )
+		);
 
-unset( $appearance_cap );
+		if ( current_user_can( 'create_users' ) ) {
+			$submenu[10] = array( __( 'Add New User' ), 'create_users', 'user-new.php' );
+		} elseif ( is_multisite() ) {
+			$submenu[10] = array( __( 'Add New User' ), 'promote_users', 'user-new.php' );
+		}
 
-// Add 'Editor' to the bottom of the Appearance menu.
-if ( ! is_multisite() ) {
-	add_action('admin_menu', '_add_themes_utility_last', 101);
-}
-/**
- *
- */
-function _add_themes_utility_last() {
-	// Must use API on the admin_menu hook, direct modification is only possible on/before the _admin_menu hook
-	add_submenu_page('themes.php', _x('Editor', 'theme editor'), _x('Editor', 'theme editor'), 'edit_themes', 'theme-editor.php');
-}
+		return $submenu;
+	}
 
-$count = '';
-if ( ! is_multisite() && current_user_can( 'update_plugins' ) ) {
-	if ( ! isset( $update_data ) )
-		$update_data = wp_get_update_data();
-	$count = "<span class='update-plugins count-{$update_data['counts']['plugins']}'><span class='plugin-count'>" . number_format_i18n($update_data['counts']['plugins']) . "</span></span>";
-}
+	public function add_submenu( $file ) {
+		$sub = array();
 
-$menu[65] = array( sprintf( __('Plugins %s'), $count ), 'activate_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'dashicons-admin-plugins' );
+		switch ( $file ) {
+		case 'index.php':
+			$sub = $this->get_index_submenu();
+			break;
 
-$submenu['plugins.php'][5]  = array( __('Installed Plugins'), 'activate_plugins', 'plugins.php' );
+		case 'edit.php':
+			$sub = $this->get_post_submenu();
+			break;
 
-	if ( ! is_multisite() ) {
-		/* translators: add new plugin */
-		$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' );
+		case 'upload.php':
+			$sub = $this->get_upload_submenu();
+			break;
+
+		case 'link-manager.php':
+			$sub = $this->get_link_manager_submenu();
+			break;
+
+		case 'edit.php?post_type=page':
+			$sub = $this->get_page_submenu();
+			break;
+
+		case 'edit-comments.php':
+			$sub = $this->get_comment_submenu();
+			break;
+
+		case 'themes.php':
+			$sub = $this->get_theme_submenu();
+			break;
+
+		case 'plugins.php':
+			$sub = $this->get_plugin_submenu();
+			break;
+
+		case 'tools.php':
+			$sub = $this->get_tools_submenu();
+			break;
+
+		case 'options-general.php':
+			$sub = $this->get_options_submenu();
+			break;
+
+		case 'users.php':
+			$sub = $this->get_user_submenu();
+			break;
+
+		case 'profile.php':
+			$sub = $this->get_profile_submenu();
+			break;
+		}
+
+		$this->submenu[ $file ] = $sub;
 	}
 
-unset( $update_data );
+	// Back-compat for old top-levels
+	public function get_top_level_back_compat() {
+		$files = array(
+			'post.php' => 'edit.php',
+			'post-new.php' => 'edit.php',
+			'edit-pages.php' => 'edit.php?post_type=page',
+			'page-new.php' => 'edit.php?post_type=page',
+			'wpmu-admin.php' => 'tools.php',
+			'ms-admin.php' => 'tools.php',
+		);
 
-if ( current_user_can('list_users') )
-	$menu[70] = array( __('Users'), 'list_users', 'users.php', '', 'menu-top menu-icon-users', 'menu-users', 'dashicons-admin-users' );
-else
-	$menu[70] = array( __('Profile'), 'read', 'profile.php', '', 'menu-top menu-icon-users', 'menu-users', 'dashicons-admin-users' );
+		if ( current_user_can('list_users') ) {
+			// Back-compat for plugins adding submenus to profile.php.
+			$files['profile.php'] = 'users.php';
+		} else {
+			$files['users.php'] = 'profile.php';
+		}
 
-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');
-	if ( current_user_can( 'create_users' ) ) {
-		$submenu['users.php'][10] = array(_x('Add New', 'user'), 'create_users', 'user-new.php');
-	} elseif ( is_multisite() ) {
-		$submenu['users.php'][10] = array(_x('Add New', 'user'), 'promote_users', 'user-new.php');
+		return $files;
 	}
 
-	$submenu['users.php'][15] = array(__('Your Profile'), 'read', 'profile.php');
-} else {
-	$_wp_real_parent_file['users.php'] = 'profile.php';
-	$submenu['profile.php'][5] = array(__('Your Profile'), 'read', 'profile.php');
-	if ( current_user_can( 'create_users' ) ) {
-		$submenu['profile.php'][10] = array(__('Add New User'), 'create_users', 'user-new.php');
-	} elseif ( is_multisite() ) {
-		$submenu['profile.php'][10] = array(__('Add New User'), 'promote_users', 'user-new.php');
+	// ensure we're backwards compatible
+	public function get_compat() {
+		return array(
+			'index' => 'dashboard',
+			'edit' => 'posts',
+			'post' => 'posts',
+			'upload' => 'media',
+			'link-manager' => 'links',
+			'edit-pages' => 'pages',
+			'page' => 'pages',
+			'edit-comments' => 'comments',
+			'options-general' => 'settings',
+			'themes' => 'appearance',
+		);
 	}
-}
 
-$menu[75] = array( __('Tools'), 'edit_posts', 'tools.php', '', 'menu-top menu-icon-tools', 'menu-tools', 'dashicons-admin-tools' );
-	$submenu['tools.php'][5] = array( __('Available Tools'), 'edit_posts', 'tools.php' );
-	$submenu['tools.php'][10] = array( __('Import'), 'import', 'import.php' );
-	$submenu['tools.php'][15] = array( __('Export'), 'export', 'export.php' );
-	if ( is_multisite() && !is_main_site() )
-		$submenu['tools.php'][25] = array( __('Delete Site'), 'delete_site', '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');
+	public function add_post_type_menus() {
+		$core_menu_positions = array( 59, 60, 65, 70, 75, 80, 85, 99 );
+		$post_types = get_post_types( array( 'show_ui' => true, '_builtin' => false, 'show_in_menu' => true ), 'objects' );
+		$show_types = wp_list_filter( $post_types, array( 'show_in_menu' => true ) );
 
-$menu[80] = array( __('Settings'), 'manage_options', 'options-general.php', '', 'menu-top menu-icon-settings', 'menu-settings', 'dashicons-admin-settings' );
-	$submenu['options-general.php'][10] = array(_x('General', 'settings screen'), 'manage_options', 'options-general.php');
-	$submenu['options-general.php'][15] = array(__('Writing'), 'manage_options', 'options-writing.php');
-	$submenu['options-general.php'][20] = array(__('Reading'), 'manage_options', 'options-reading.php');
-	$submenu['options-general.php'][25] = array(__('Discussion'), 'manage_options', 'options-discussion.php');
-	$submenu['options-general.php'][30] = array(__('Media'), 'manage_options', 'options-media.php');
-	$submenu['options-general.php'][40] = array(__('Permalinks'), 'manage_options', 'options-permalink.php');
+		foreach ( $show_types as $ptype ) {
+			// If we're to use $_wp_last_object_menu, increment it first.
+			$ptype_menu_position = is_int( $ptype->menu_position ) ? $ptype->menu_position : ++$this->_wp_last_object_menu;
+			$ptype_for_id = sanitize_html_class( $ptype->name );
 
-$_wp_last_utility_menu = 80; // The index of the last top-level menu in the utility menu group
+			if ( is_string( $ptype->menu_icon ) ) {
+				// Special handling for data:image/svg+xml and Dashicons.
+				if ( 0 === strpos( $ptype->menu_icon, 'data:image/svg+xml;base64,' ) || 0 === strpos( $ptype->menu_icon, 'dashicons-' ) ) {
+					$menu_icon = $ptype->menu_icon;
+				} else {
+					$menu_icon = esc_url( $ptype->menu_icon );
+				}
+				$ptype_class = $ptype_for_id;
+			} else {
+				$menu_icon   = 'dashicons-admin-post';
+				$ptype_class = 'post';
+			}
 
-$menu[99] = array( '', 'read', 'separator-last', '', 'wp-menu-separator' );
+			/*
+			 * If $ptype_menu_position is already populated or will be populated
+			 * by a hard-coded value below, increment the position.
+			 */
+			while ( isset( $this->menu[ $ptype_menu_position ] ) || in_array( $ptype_menu_position, $core_menu_positions ) ) {
+				$ptype_menu_position++;
+			}
 
-// Back-compat for old top-levels
-$_wp_real_parent_file['post.php'] = 'edit.php';
-$_wp_real_parent_file['post-new.php'] = 'edit.php';
-$_wp_real_parent_file['edit-pages.php'] = 'edit.php?post_type=page';
-$_wp_real_parent_file['page-new.php'] = 'edit.php?post_type=page';
-$_wp_real_parent_file['wpmu-admin.php'] = 'tools.php';
-$_wp_real_parent_file['ms-admin.php'] = 'tools.php';
+			$this->menu[ $ptype_menu_position ] = array(
+				esc_attr( $ptype->labels->menu_name ),
+				$ptype->cap->edit_posts,
+				"edit.php?post_type={$ptype->name}",
+				'',
+				'menu-top menu-icon-' . $ptype_class,
+				'menu-posts-' . $ptype_for_id,
+				$menu_icon
+			);
 
-// ensure we're backwards compatible
-$compat = array(
-	'index' => 'dashboard',
-	'edit' => 'posts',
-	'post' => 'posts',
-	'upload' => 'media',
-	'link-manager' => 'links',
-	'edit-pages' => 'pages',
-	'page' => 'pages',
-	'edit-comments' => 'comments',
-	'options-general' => 'settings',
-	'themes' => 'appearance',
-	);
+			$this->add_post_type_submenu( $ptype );
+		}
+	}
 
-require_once(ABSPATH . 'wp-admin/includes/menu.php');
+	public function add_post_type_submenu( $ptype ) {
+		$submenu = array(
+			5  => array( $ptype->labels->all_items, $ptype->cap->edit_posts,  "edit.php?post_type={$ptype->name}"),
+			10 => array( $ptype->labels->add_new, $ptype->cap->create_posts, "post-new.php?post_type={$ptype->name}" )
+		);
+
+		$i = 15;
+		foreach ( get_taxonomies( array(), 'objects' ) as $tax ) {
+			if ( ! $tax->show_ui || ! $tax->show_in_menu || ! in_array( $ptype->name, (array) $tax->object_type, true ) ) {
+				continue;
+			}
+
+			$submenu[ $i++ ] = array(
+				esc_attr( $tax->labels->menu_name ),
+				$tax->cap->manage_terms,
+				"edit-tags.php?taxonomy={$tax->name}&amp;post_type={$ptype->name}"
+			);
+		}
+
+		$this->submenu[ "edit.php?post_type={$ptype->name}" ] = $submenu;
+	}
+}
+
+function _add_themes_utility_last() {
+	// Must use API on the admin_menu hook, direct modification is only possible on/before the _admin_menu hook
+	add_submenu_page('themes.php', _x( 'Editor', 'theme editor' ), _x( 'Editor', 'theme editor' ), 'edit_themes', 'theme-editor.php' );
+}
+
+new WP_Admin_Menu();
+
+require_once( ABSPATH . 'wp-admin/includes/menu.php' );
