From 0920c3eb2705244e3dc8b454c3355d4419d40c82 Mon Sep 17 00:00:00 2001
From: Ryan Boren <ryan@git.wordpress.org>
Date: Tue, 26 Aug 2008 00:54:21 +0000
Subject: [PATCH] Menu fixes. see #7552

git-svn-id: https://develop.svn.wordpress.org/trunk@8734 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/includes/plugin.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php
index 430e6768ac..6c29637e26 100644
--- a/wp-admin/includes/plugin.php
+++ b/wp-admin/includes/plugin.php
@@ -478,7 +478,7 @@ function add_users_page( $page_title, $menu_title, $access_level, $file, $functi
 // Pluggable Menu Support -- Private
 //
 
-function get_admin_page_parent() {
+function get_admin_page_parent( $parent = '' ) {
 	global $parent_file;
 	global $menu;
 	global $submenu;
@@ -488,6 +488,12 @@ function get_admin_page_parent() {
 	global $_wp_menu_nopriv;
 	global $_wp_submenu_nopriv;
 
+	if ( !empty ( $parent ) ) {
+		if ( isset( $_wp_real_parent_file[$parent] ) )
+			$parent = $_wp_real_parent_file[$parent];
+		return $parent;
+	}
+
 	if ( !empty ( $parent_file ) ) {
 		if ( isset( $_wp_real_parent_file[$parent_file] ) )
 			$parent_file = $_wp_real_parent_file[$parent_file];
@@ -607,7 +613,7 @@ function get_plugin_page_hook( $plugin_page, $parent_page ) {
 function get_plugin_page_hookname( $plugin_page, $parent_page ) {
 	global $admin_page_hooks;
 
-	$parent = get_admin_page_parent();
+	$parent = get_admin_page_parent( $parent_page );
 
 	$page_type = 'admin';
 	if ( empty ( $parent_page ) || 'admin.php' == $parent_page ) {