Make WordPress Core


Ignore:
Timestamp:
03/04/2010 12:15:55 AM (14 years ago)
Author:
ryan
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/includes/plugin.php

    r13256 r13579  
    818818
    819819    $hookname = get_plugin_page_hookname( $menu_slug, '' );
     820
    820821    if (!empty ( $function ) && !empty ( $hookname ) && current_user_can( $capability ) )
    821822        add_action( $hookname, $function );
     
    11681169    global $submenu;
    11691170    global $pagenow;
     1171    global $typenow;
    11701172    global $plugin_page;
    11711173    global $_wp_real_parent_file;
     
    12161218            if ( isset( $_wp_real_parent_file[$parent] ) )
    12171219                $parent = $_wp_real_parent_file[$parent];
    1218             if ( $submenu_array[2] == $pagenow && ( empty($parent_file) || false === strpos($parent_file, '?') ) ) {
     1220            if ( !empty($typenow) && ($submenu_array[2] == "$pagenow?post_type=$typenow") ) {
     1221                $parent_file = $parent;
     1222                return $parent;
     1223            } elseif ( $submenu_array[2] == $pagenow && empty($typenow) && ( empty($parent_file) || false === strpos($parent_file, '?') ) ) {
    12191224                $parent_file = $parent;
    12201225                return $parent;
     
    13271332    }
    13281333
     1334
    13291335    $plugin_name = preg_replace( '!\.php!', '', $plugin_page );
    13301336
     
    13511357
    13521358        $hookname = get_plugin_page_hookname($plugin_page, $parent);
     1359
    13531360        if ( !isset($_registered_pages[$hookname]) )
    13541361            return false;
Note: See TracChangeset for help on using the changeset viewer.