Changeset 4097

Timestamp:

08/15/06 21:03:11 (2 years ago)

Author:

ryan

Message:

More menu fixes. #2257

Files:

• trunk/wp-admin/admin-functions.php (modified) (6 diffs)
• trunk/wp-admin/index.php (modified) (1 diff)
• trunk/wp-admin/menu.php (modified) (6 diffs)

trunk/wp-admin/admin-functions.php

@@ -1339 +1339 @@
-    global $menu;
-    global $submenu;
-
+
+
-    global $plugin_page;
-
-    $parent = get_admin_page_parent();
-
-menu_nopriv
+
+_wp_submenu_nopriv[$parent]
-        return false;
-
-menu_nopriv
+_wp_submenu_nopriv[$parent]
-        return false;
-    
-    if ( empty($parent) )
-tru
+fals
-
-    if (isset ($submenu[$parent])) {
@@ -1365 +1366 @@
-
-    foreach ($menu as $menu_array) {
-        //echo "parent array: " . $menu_array[2];
-        if ($menu_array[2] == $parent) {
-            if (current_user_can($menu_array[1]))
@@ -1430 +1430 @@
-    global $pagenow;
-    global $plugin_page;
-
+
+
+
-
-    if ( !empty ($parent_file) ) {
-
-
+_wp_
+_wp_
-
-        return $parent_file;
@@ -1443 +1445 @@
-            if ($parent_menu[2] == $plugin_page) {
-                $parent_file = $plugin_page;
-
-
-
+
+
-                return $parent_file;
-            }
-        }
+        if ( isset($_wp_menu_nopriv[$plugin_page]) ) {
+            $parent_file = $plugin_page;
+            if ( isset($_wp_real_parent_file[$parent_file]) )
+                    $parent_file = $_wp_real_parent_file[$parent_file];
+            return $parent_file;
+        }           
+    }
+
+    if ( isset($plugin_page) && isset($_wp_submenu_nopriv[$pagenow][$plugin_page]) ) {
+        $parent_file = $pagenow;
+        if ( isset($_wp_real_parent_file[$parent_file]) )
+            $parent_file = $_wp_real_parent_file[$parent_file];
+        return $parent_file;        
-    }
-
-    foreach (array_keys($submenu) as $parent) {
-        foreach ($submenu[$parent] as $submenu_array) {
-
-
+_wp_
+_wp_
-            if ($submenu_array[2] == $pagenow) {
-                $parent_file = $parent;
@@ -1489 +1503 @@
-    global $submenu;
-    global $menu;
-
-
+
+
+
-
-    $file = plugin_basename($file);
-
+
+
+
+
+
-    if ( !current_user_can($access_level) ) {
-menu_nopriv
+_wp_submenu_nopriv[$parent]
-        return false;
-    }
-
-    $parent = plugin_basename($parent);
-    if ( isset($real_parent_file[$parent]) )
-        $parent = $real_parent_file[$parent];
-
-    // If the parent doesn't already have a submenu, add a link to the parent
@@ -1507 +1522 @@
-    // parent file someone is trying to link back to the parent manually.  In
-    // this case, don't automatically add a link back to avoid duplication.
-
+  
-        foreach ($menu as $parent_menu) {
-$parent_menu[2] == $parent
+ $parent_menu[2] == $parent && current_user_can($parent_menu[1]) 
-                $submenu[$parent][] = $parent_menu;
-            }

trunk/wp-admin/index.php

@@ -2 +2 @@
-require_once('admin.php'); 
-$title = __('Dashboard'); 
+$parent_file = 'index.php';
-require_once('admin-header.php');
-require_once (ABSPATH . WPINC . '/rss.php');

trunk/wp-admin/menu.php

@@ -44 +44 @@
-
-if ( current_user_can('edit_users') ) {
-
+_wp_
-    $submenu['users.php'][5] = array(__('Authors & Users'), 'edit_users', 'users.php');
-    $submenu['users.php'][10] = array(__('Your Profile'), 'read', 'profile.php');
@@ -74 +74 @@
-    foreach ($sub as $index => $data) {
-        if ( ! current_user_can($data[1]) ) {
-            $menu_nopriv[$data[2]] = true;
-            unset($submenu[$parent][$index]);
-        }
@@ -96 +95 @@
-    // make the first submenu the new parent.
-    if ( $new_parent != $old_parent ) {
-
+_wp_
-        $menu[$id][2] = $new_parent;
-        
@@ -103 +102 @@
-            unset($submenu[$old_parent][$index]);
-        }
-
+
+
-    }
-}
@@ -110 +110 @@
-
-// Remove menus that have no accessible submenus and require privs that the user does not have.
+// Run re-parent loop again.
-foreach ( $menu as $id => $data ) {
-    // If submenu is empty...
@@ -115 +116 @@
-        // And user doesn't have privs, remove menu.
-        if ( ! current_user_can($data[1]) ) {
-
+_wp_
-            unset($menu[$id]);
-        }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-