Changeset 9178 for trunk/wp-admin/includes/plugin.php

Timestamp:

10/14/2008 10:44:56 PM (17 years ago)

Author:

ryan

Message:

Menu fixes

File:

• trunk/wp-admin/includes/plugin.php (modified) (4 diffs)

trunk/wp-admin/includes/plugin.php

@@ -498 +498 @@
     $file = plugin_basename( $file );
 
-    $menu[] = array ( $menu_title, $access_level, $file, $page_title );
-
     $admin_page_hooks[$file] = sanitize_title( $menu_title );
 
@@ -505 +503 @@
     if (!empty ( $function ) && !empty ( $hookname ))
         add_action( $hookname, $function );
+
+    $menu[] = array ( $menu_title, $access_level, $file, $page_title, $hookname, $hookname );
 
     return $hookname;
@@ -661 +661 @@
 
     $parent = $parent1 = get_admin_page_parent();
+
     if ( empty ( $parent) ) {
         foreach ( $menu as $menu_array ) {
@@ -719 +720 @@
 
     $page_type = 'admin';
-    if ( empty ( $parent_page ) || 'admin.php' == $parent_page ) {
-        if ( isset( $admin_page_hooks[$plugin_page] ))
+    if ( empty ( $parent_page ) || 'admin.php' == $parent_page || isset( $admin_page_hooks[$plugin_page] ) ) {
+        if ( isset( $admin_page_hooks[$plugin_page] ) )
             $page_type = 'toplevel';
         else