Changeset 9337

Timestamp:

10/24/2008 10:40:19 PM (16 years ago)

Author:

ryan

Message:

If parent uses admin.php, use admin.php for subs. fixes #7962

File:

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

trunk/wp-admin/menu-header.php

@@ -37 +37 @@
     // 0 = name, 1 = capability, 2 = file, 3 = class, 4 = id, 5 = icon src
     foreach ( $menu as $key => $item ) {
+        $admin_is_parent = false;
         $class = array();
         if ( $first ) {
@@ -67 +68 @@
             $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]}") || !empty($menu_hook))
+            if ( 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>{$item[0]}</a>";
-            else
+            } else {
                 echo "\n\t$img$toggle<a href='{$submenu[$item[2]][0][2]}'$class>{$item[0]}</a>";
+            }
         } 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) ) {
+                $admin_is_parent = true;
                 echo "\n\t$img$toggle<a href='admin.php?page={$item[2]}'$class>{$item[0]}</a>";
             } else {
@@ -107 +111 @@
                 if ( 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 = (file_exists(WP_PLUGIN_DIR . "/{$item[2]}") && !is_dir(WP_PLUGIN_DIR . "/{$item[2]}") ) || file_exists($item[2]);
+                    $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 )
                         echo "<li$class><a href='{$item[2]}?page={$sub_item[2]}'$class>{$sub_item[0]}</a></li>";