From df492283e68394856e08d159c9cb4c6ab2bdaa9c Mon Sep 17 00:00:00 2001
From: westi <westi@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Fri, 7 Mar 2008 14:48:10 +0000
Subject: [PATCH] Work harder to create the correct links for new top level
 menus. Fixes #4907 props DD32.

git-svn-id: http://svn.automattic.com/wordpress/trunk@7183 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/menu-header.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/wp-admin/menu-header.php b/wp-admin/menu-header.php
index bb07934dd..b9c1dde93 100644
--- a/wp-admin/menu-header.php
+++ b/wp-admin/menu-header.php
@@ -24,7 +24,8 @@ foreach ( $menu as $key => $item ) {
 		else
 			echo "\n\t<li><a href='{$submenu[$item[2]][0][2]}'$class>{$item[0]}</a></li>";
 	} else if ( current_user_can($item[1]) ) {
-		if ( file_exists(ABSPATH . PLUGINDIR . "/{$item[2]}") )
+		$menu_hook = get_plugin_page_hook($item[2], 'admin.php');
+		if ( file_exists(ABSPATH . PLUGINDIR . "/{$item[2]}") || !empty($menu_hook) )
 			echo "\n\t<li><a href='admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";
 		else
 			echo "\n\t<li><a href='{$item[2]}'$class>{$item[0]}</a></li>";
@@ -53,7 +54,8 @@ foreach ( $menu as $key => $item ) {
 		else
 			echo "\n\t<li><a href='{$submenu[$item[2]][0][2]}'$class>{$item[0]}</a></li>";
 	} else if ( current_user_can($item[1]) ) {
-		if ( file_exists(ABSPATH . PLUGINDIR . "/{$item[2]}") )
+		$menu_hook = get_plugin_page_hook($item[2], 'admin.php');
+		if ( file_exists(ABSPATH . PLUGINDIR . "/{$item[2]}") || !empty($menu_hook) )
 			echo "\n\t<li><a href='admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";
 		else
 			echo "\n\t<li><a href='{$item[2]}'$class>{$item[0]}</a></li>";
@@ -77,7 +79,8 @@ foreach ( $menu as $key => $item ) {
 		else
 			echo "\n\t<li><a href='{$submenu[$item[2]][0][2]}'$class>{$item[0]}</a></li>";
 	} else if ( current_user_can($item[1]) ) {
-		if ( file_exists(ABSPATH . PLUGINDIR . "/{$item[2]}") )
+		$menu_hook = get_plugin_page_hook($item[2], 'admin.php');
+		if ( file_exists(ABSPATH . PLUGINDIR . "/{$item[2]}") || !empty($menu_hook) )
 			echo "\n\t<li><a href='admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";
 		else
 			echo "\n\t<li><a href='{$item[2]}'$class>{$item[0]}</a></li>";
@@ -108,7 +111,8 @@ foreach ( $menu as $key => $item ) {
 		else
 			$side_items[] = "\n\t<li><a href='{$submenu[$item[2]][0][2]}'$class>{$item[0]}</a>";
 	} else if ( current_user_can($item[1]) ) {
-		if ( file_exists(ABSPATH . PLUGINDIR . "/{$item[2]}") )
+		$menu_hook = get_plugin_page_hook($item[2], 'admin.php');
+		if ( file_exists(ABSPATH . PLUGINDIR . "/{$item[2]}") || !empty($menu_hook) )
 			$side_items[] = "\n\t<li><a href='admin.php?page={$item[2]}'$class>{$item[0]}</a>";
 		else
 			$side_items[] = "\n\t<li><a href='{$item[2]}'$class>{$item[0]}</a>";