Changeset 13579 for trunk/wp-admin/includes/plugin.php

Timestamp:

03/04/2010 12:15:55 AM (17 years ago)

Author:

ryan

Message:

Fix submenus for post types. Props TobiasBg. see #12453

File:

• trunk/wp-admin/includes/plugin.php (modified) (5 diffs)

trunk/wp-admin/includes/plugin.php

@@ -818 +818 @@
 
         $hookname = get_plugin_page_hookname( $menu_slug, '' );
+
         if (!empty ( $function ) && !empty ( $hookname ) && current_user_can( $capability ) )
                 add_action( $hookname, $function );
@@ -1168 +1169 @@
         global $submenu;
         global $pagenow;
+        global $typenow;
         global $plugin_page;
         global $_wp_real_parent_file;
@@ -1216 +1218 @@
                         if ( isset( $_wp_real_parent_file[$parent] ) )
                                 $parent = $_wp_real_parent_file[$parent];
-                        if ( $submenu_array[2] == $pagenow && ( empty($parent_file) || false === strpos($parent_file, '?') ) ) {
+                        if ( !empty($typenow) && ($submenu_array[2] == "$pagenow?post_type=$typenow") ) {
+                                $parent_file = $parent;
+                                return $parent;
+                        } elseif ( $submenu_array[2] == $pagenow && empty($typenow) && ( empty($parent_file) || false === strpos($parent_file, '?') ) ) {
                                 $parent_file = $parent;
                                 return $parent;
@@ -1327 +1332 @@
         }
 
+
         $plugin_name = preg_replace( '!\.php!', '', $plugin_page );
 
@@ -1351 +1357 @@
 
                 $hookname = get_plugin_page_hookname($plugin_page, $parent);
+
                 if ( !isset($_registered_pages[$hookname]) )
                         return false;