Ticket #24137: 24137.patch

wp-admin/post-new.php

@@ -28 +28 @@
         $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 ) ] ) )
+                if (
+                        ! isset( $_registered_pages[ get_plugin_page_hookname( "post-new.php?post_type=$post_type", $post_type_object->show_in_menu ) ] ) &&
+                        isset( $_registered_pages[ get_plugin_page_hookname( "edit.php?post_type=$post_type", $post_type_object->show_in_menu ) ] )             
+                ) {
+                        $submenu_file = "edit.php?post_type=$post_type";
+                } else {
                         $submenu_file = $parent_file;
+                }
         } else {
                 $parent_file = "edit.php?post_type=$post_type";
         }