X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/fef8173b8c3bad08f495551e43cfdeac1cae6021..96bc8e88cf39086a9e0a883b8e2c311fe82a5e97:/wp-admin/post-new.php

diff --git a/wp-admin/post-new.php b/wp-admin/post-new.php
index ed123a46..a5d74e8b 100644
--- a/wp-admin/post-new.php
+++ b/wp-admin/post-new.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * New Post Administration Panel.
+ * New Post Administration Screen.
  *
  * @package WordPress
  * @subpackage Administration
@@ -16,16 +16,22 @@ elseif ( in_array( $_GET['post_type'], get_post_types( array('show_ui' => true )
 else
 	wp_die( __('Invalid post type') );
 
-if ( 'post' != $post_type ) {
-	$parent_file = "edit.php?post_type=$post_type";
-	$submenu_file = "post-new.php?post_type=$post_type";
-} else {
+$post_type_object = get_post_type_object( $post_type );
+
+if ( 'post' == $post_type ) {
 	$parent_file = 'edit.php';
 	$submenu_file = 'post-new.php';
+} else {
+	$submenu_file = "post-new.php?post_type=$post_type";
+	if ( isset( $post_type_object ) && $post_type_object->show_in_menu && $post_type_object->show_in_menu !== true ) {
+		$parent_file = $post_type_object->show_in_menu;
+		if ( ! isset( $_registered_pages[ get_plugin_page_hookname( "post-new.php?post_type=$post_type", $post_type_object->show_in_menu ) ] ) )
+			$submenu_file = $parent_file;
+	} else {
+		$parent_file = "edit.php?post_type=$post_type";
+	}
 }
 
-$post_type_object = get_post_type_object($post_type);
-
 $title = $post_type_object->labels->add_new_item;
 
 $editing = true;