Changeset 4093

Timestamp:

08/14/2006 09:24:43 PM (18 years ago)

Author:

ryan

Message:

menu fixes. #2257 #2696

Location:

trunk/wp-admin

Files:

• admin-functions.php (modified) (1 diff)
• menu.php (modified) (4 diffs)

trunk/wp-admin/admin-functions.php

@@ -1490 +1490 @@
     global $menu;
     global $real_parent_file;
+    global $menu_nopriv;
+
+    $file = plugin_basename($file);
+    //echo "Adding $parent $file $access_level<br />";
+    if ( !current_user_can($access_level) ) {
+        $menu_nopriv[$file] = true;
+        return false;
+    }
 
     $parent = plugin_basename($parent);
     if ( isset($real_parent_file[$parent]) )
         $parent = $real_parent_file[$parent];
-
-    $file = plugin_basename($file);
 
     // If the parent doesn't already have a submenu, add a link to the parent

trunk/wp-admin/menu.php

@@ -44 +44 @@
 
 if ( current_user_can('edit_users') ) {
+    $real_parent_file['profile.php'] = 'users.php'; // Back-compat for plugins adding submenus to profile.php.
     $submenu['users.php'][5] = array(__('Authors & Users'), 'edit_users', 'users.php');
     $submenu['users.php'][10] = array(__('Your Profile'), 'read', 'profile.php');
@@ -69 +70 @@
 }
 
-do_action('admin_menu', '');
-
 // Loop over submenus and remove pages for which the user does not have privs.
 foreach ($submenu as $parent => $sub) {
@@ -85 +84 @@
 
 // Loop over the top-level menu.
-// Remove menus that have no accessible submenus and require privs that the user does not have.
 // Menus for which the original parent is not acessible due to lack of privs will have the next
 // submenu in line be assigned as the new menu parent. 
+foreach ( $menu as $id => $data ) {
+    if ( empty($submenu[$data[2]]) ) 
+        continue;
+    $subs = $submenu[$data[2]];
+    $first_sub = array_shift($subs);
+    $old_parent = $data[2];
+    $new_parent = $first_sub[2];
+    // If the first submenu is not the same as the assigned parent,
+    // make the first submenu the new parent.
+    if ( $new_parent != $old_parent ) {
+        $real_parent_file[$old_parent] = $new_parent;
+        $menu[$id][2] = $new_parent;
+        
+        foreach ($submenu[$old_parent] as $index => $data) {
+            $submenu[$new_parent][$index] = $submenu[$old_parent][$index];
+            unset($submenu[$old_parent][$index]);
+        }
+        unset($submenu[$old_parent]);   
+    }
+}
+
+do_action('admin_menu', '');
+
+// Remove menus that have no accessible submenus and require privs that the user does not have.
 foreach ( $menu as $id => $data ) {
     // If submenu is empty...
@@ -96 +118 @@
             unset($menu[$id]);
         }
-    } else {
-        $subs = $submenu[$data[2]];
-        $first_sub = array_shift($subs);
-        $old_parent = $data[2];
-        $new_parent = $first_sub[2];
-        // If the first submenu is not the same as the assigned parent,
-        // make the first submenu the new parent.
-        if ( $new_parent != $old_parent ) {
-            $real_parent_file[$old_parent] = $new_parent;
-            $menu[$id][2] = $new_parent;
-            
-            foreach ($submenu[$old_parent] as $index => $data) {
-                $submenu[$new_parent][$index] = $submenu[$old_parent][$index];
-                unset($submenu[$old_parent][$index]);
-            }
-            unset($submenu[$old_parent]);   
-        }
-    }
+    } 
 }