Ticket #5001: admin-menu.diff

E:/EclipseWorkWeb/WordPressDev/wp-admin/menu-header.php

@@ -3 +3 @@
 $self = preg_replace('|^.*/wp-admin/|i', '', $_SERVER['PHP_SELF']);
 $self = preg_replace('|^.*/plugins/|i', '', $self);
 
+// Reset parent file variable, as it may be set incorrectly
+// during plugin inits
+$parent_file = '';
+
 get_admin_page_parent();
 
 foreach ($menu as $item) {

E:/EclipseWorkWeb/WordPressDev/wp-admin/includes/plugin.php

@@ -217 +217 @@
                                 $parent_file = $parent;
                                 return $parent;
                         } else
-                                if ( isset( $plugin_page ) && ($plugin_page == $submenu_array[2] ) ) {
+                                if ( isset( $plugin_page ) && ($plugin_page == $submenu_array[2] ) 
+                                        && (( $pagenow == $parent ) || ( $pagenow == 'admin.php'))) {
                                         $parent_file = $parent;
                                         return $parent;
                                 }
@@ -299 +300 @@
 function get_plugin_page_hookname( $plugin_page, $parent_page ) {
         global $admin_page_hooks;
 
+        $parent_file = '';
         $parent = get_admin_page_parent();
 
         if ( empty ( $parent_page ) || 'admin.php' == $parent_page ) {

E:/EclipseWorkWeb/WordPressDev/wp-admin/admin.php

@@ -41 +41 @@
 if (isset($plugin_page)) {
         $page_hook = get_plugin_page_hook($plugin_page, $pagenow);
 
+        // if this did not work, try using the parent file instead of $pagenow, which is probably set to admin.php
+        if( !$page_hook ) {
+                $page_hook = get_plugin_page_hook( $plugin_page, $parent_file );
+        }
+
         if ( $page_hook ) {
                 do_action('load-' . $page_hook);
                 if (! isset($_GET['noheader']))