Changeset 10890 for trunk/wp-admin/menu-header.php

Timestamp:

04/08/2009 06:20:33 PM (15 years ago)

Author:

ryan

Message:

Ignore index.php in plugins dir when creating menus. Props Denis-de-Bernardy. fixes #6478

File:

• trunk/wp-admin/menu-header.php (modified) (3 diffs)

trunk/wp-admin/menu-header.php

@@ -75 +75 @@
             $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<a href='admin.php?page={$submenu[$item[2]][0][2]}'$class$tabindex>{$item[0]}</a>";
@@ -83 +83 @@
         } 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<a href='admin.php?page={$item[2]}'$class$tabindex>{$item[0]}</a>";
@@ -116 +116 @@
                 $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]);