Remove custom post states. Register taxonomy against menu_item post type. see #11817

git-svn-id: http://svn.automattic.com/wordpress/trunk@13260 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-includes/post.php

@@ -71,6 +71,7 @@ function create_initial_post_types() {
 											'rewrite' => false,
 											'query_var' => false,
 										) );
+
 	register_post_status( 'publish', array(	'label' => _x('Published', 'post'),
 											'public' => true,
 											'_builtin' => true,
@@ -113,18 +114,6 @@ function create_initial_post_types() {
 											'_builtin' => true,
 											'label_count' => _n_noop('Auto-Draft <span class="count">(%s)</span>', 'Auto-Drafts <span class="count">(%s)</span>')
 										) );
-
-	register_post_status( 'menu-category', array(	'internal' => true,
-											'_builtin' => true
-										) );
-
-	register_post_status( 'menu-page', array(	'internal' => true,
-											'_builtin' => true
-										) );
-
-	register_post_status( 'menu-custom', array(	'internal' => true,
-											'_builtin' => true
-										) );
 }
 add_action( 'init', 'create_initial_post_types', 0 ); // highest priority
 

wp-includes/taxonomy.php

@@ -38,7 +38,7 @@ function create_initial_taxonomies() {
 													'_builtin' => true
 												) ) ;
 
-	register_taxonomy( 'menu', 'post', array(		'hierarchical' => false,
+	register_taxonomy( 'menu', 'menu_item', array(	'hierarchical' => false,
 													'query_var' => false,
 													'rewrite' => false,
 													'show_ui' => false,