From 6513808db0966db74f7264daa5fb0bc8c61bbb2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Helen=20Hou-Sand=C3=AD?= Date: Fri, 25 Jul 2014 15:26:18 +0000 Subject: [PATCH] When adding a post of a post type whose menu item is in a submenu, highlight the correct menu item. props mordauk, markjaquith. fixes #24137. Built from https://develop.svn.wordpress.org/trunk@29300 git-svn-id: http://core.svn.wordpress.org/trunk@29082 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/post-new.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/wp-admin/post-new.php b/wp-admin/post-new.php index 79896c3b78..bfdffaf3a3 100644 --- a/wp-admin/post-new.php +++ b/wp-admin/post-new.php @@ -28,8 +28,16 @@ if ( 'post' == $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; + // What if there isn't a post-new.php item for this post type? + 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( "edit.php?post_type=$post_type", $post_type_object->show_in_menu ) ] ) ) { + // Fall back to edit.php for that post type, if it exists + $submenu_file = "edit.php?post_type=$post_type"; + } else { + // Otherwise, give up and highlight the parent + $submenu_file = $parent_file; + } + } } else { $parent_file = "edit.php?post_type=$post_type"; }