Changeset 8735

Timestamp:

08/26/2008 04:27:00 AM (18 years ago)

Author:

ryan

Message:

Menu fixes. see #7552

Location:

trunk/wp-admin

Files:

• includes/plugin.php (modified) (1 diff)
• menu-header.php (modified) (1 diff)

trunk/wp-admin/includes/plugin.php

@@ -489 +489 @@
         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];

trunk/wp-admin/menu-header.php

@@ -88 +88 @@
 
                                 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