Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-26 14:54:57 +02:00
Code Issues Projects Releases Wiki Activity

Menu fixes. see #7552

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@8735 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2008-08-26 04:27:00 +00:00
parent d871525f10
commit aa37570238
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/includes/plugin.php
View File

@ -488,7 +488,7 @@ function get_admin_page_parent( $parent = '' ) {
global $_wp_menu_nopriv;
global $_wp_submenu_nopriv;
if ( !empty ( $parent ) ) {
if ( !empty ( $parent ) && 'admin.php' != $parent ) {
if ( isset( $_wp_real_parent_file[$parent] ) )
$parent = $_wp_real_parent_file[$parent];
return $parent;

2
wp-admin/menu-header.php
View File

@ -87,7 +87,7 @@ function _wp_menu_output( &$menu, &$submenu, $submenu_as_parent = true ) {
$menu_hook = get_plugin_page_hook($sub_item[2], $item[2]);
if ( file_exists(WP_PLUGIN_DIR . "/{$sub_item[2]}") || ! empty($menu_hook) ) {
if ( 'admin.php' == $pagenow )
if ( 'admin.php' == $pagenow || !file_exists(WP_PLUGIN_DIR . "/$parent_file") )
echo "\n\t\t<li$class><a href='admin.php?page={$sub_item[2]}'$class>{$sub_item[0]}</a></li>";
else
echo "\n\t\t<li$class><a href='{$item[2]}?page={$sub_item[2]}'$class>{$sub_item[0]}</a></li>";