From 974108d57c980407a9edb4cee351f3e97977264d Mon Sep 17 00:00:00 2001 From: nacin Date: Wed, 23 Nov 2011 20:45:23 +0000 Subject: [PATCH] Select the submenu item for post-new.php when using show_in_menu = 'some-parent-file' for post types. Continue to select the post-new.php submenu item if it has been separately added with add_submenu_page(). fixes #19125. git-svn-id: http://svn.automattic.com/wordpress/trunk@19425 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/post-new.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/wp-admin/post-new.php b/wp-admin/post-new.php index e4e0812283..a5d74e8b5b 100644 --- a/wp-admin/post-new.php +++ b/wp-admin/post-new.php @@ -22,11 +22,14 @@ if ( 'post' == $post_type ) { $parent_file = 'edit.php'; $submenu_file = 'post-new.php'; } else { - 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; - else - $parent_file = "edit.php?post_type=$post_type"; $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"; + } } $title = $post_type_object->labels->add_new_item;