Ticket #7214: top-level-menu.diff

wp-admin/admin.php

@@ -45 +45 @@
 
 // Handle plugin admin pages.
 if (isset($plugin_page)) {
-        $page_hook = get_plugin_page_hook($plugin_page, $pagenow);
+        if( ! $page_hook = get_plugin_page_hook($plugin_page, $pagenow) )
+                $page_hook = get_plugin_page_hook($plugin_page, $plugin_page);
 
         if ( $page_hook ) {
                 do_action('load-' . $page_hook);

wp-admin/includes/plugin.php

@@ -271 +271 @@
 
         $admin_page_hooks[$file] = sanitize_title( $menu_title );
 
-        $hookname = get_plugin_page_hookname( $file, '' );
+        $hookname = get_plugin_page_hookname( $file, $file );
         if (!empty ( $function ) && !empty ( $hookname ))
                 add_action( $hookname, $function );
 
@@ -299 +299 @@
         // as the first item in the submenu.  If the submenu file is the same as the
         // parent file someone is trying to link back to the parent manually.  In
         // this case, don't automatically add a link back to avoid duplication.
-        if (!isset( $submenu[$parent] ) && $file != $parent  ) {
+        if (!isset( $submenu[$parent] ) && $file != $parent ) {
                 foreach ( $menu as $parent_menu ) {
                         if ( $parent_menu[2] == $parent && current_user_can( $parent_menu[1] ) )
                                 $submenu[$parent][] = $parent_menu;