From 21f4aae542ed84b361b466b1c992168e92fa41b7 Mon Sep 17 00:00:00 2001 From: Ryan Boren Date: Wed, 8 Apr 2009 18:20:33 +0000 Subject: [PATCH] Ignore index.php in plugins dir when creating menus. Props Denis-de-Bernardy. fixes #6478 git-svn-id: https://develop.svn.wordpress.org/trunk@10890 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/menu-header.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wp-admin/menu-header.php b/wp-admin/menu-header.php index c6482ce152..db8dffd05a 100644 --- a/wp-admin/menu-header.php +++ b/wp-admin/menu-header.php @@ -74,7 +74,7 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) { } elseif ( $submenu_as_parent && !empty($submenu[$item[2]]) ) { $submenu[$item[2]] = array_values($submenu[$item[2]]); // Re-index. $menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]); - if ( ( file_exists(WP_PLUGIN_DIR . "/{$submenu[$item[2]][0][2]}") && ('index.php' != $submenu[$item[2]][0][2]) ) || !empty($menu_hook)) { + if ( ( ('index.php' != $submenu[$item[2]][0][2]) && file_exists(WP_PLUGIN_DIR . "/{$submenu[$item[2]][0][2]}") ) || !empty($menu_hook)) { $admin_is_parent = true; echo "$img$toggle{$item[0]}"; } else { @@ -82,7 +82,7 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) { } } else if ( current_user_can($item[1]) ) { $menu_hook = get_plugin_page_hook($item[2], 'admin.php'); - if ( file_exists(WP_PLUGIN_DIR . "/{$item[2]}") || !empty($menu_hook) ) { + if ( ('index.php' != $item[2]) && file_exists(WP_PLUGIN_DIR . "/{$item[2]}") || !empty($menu_hook) ) { $admin_is_parent = true; echo "\n\t$img$toggle{$item[0]}"; } else { @@ -115,7 +115,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]}") && ('index.php' != $sub_item[2]) ) || ! empty($menu_hook) ) { + if ( ( ('index.php' != $sub_item[2]) && file_exists(WP_PLUGIN_DIR . "/{$sub_item[2]}") ) || ! empty($menu_hook) ) { // If admin.php is the current page or if the parent exists as a file in the plugins or admin dir $parent_exists = (!$admin_is_parent && file_exists(WP_PLUGIN_DIR . "/{$item[2]}") && !is_dir(WP_PLUGIN_DIR . "/{$item[2]}") ) || file_exists($item[2]); if ( $parent_exists )