Changeset 4100

Timestamp:

08/15/2006 10:13:36 PM (20 years ago)

Author:

ryan

Message:

More fun with menus.

Location:

trunk/wp-admin

Files:

• admin-functions.php (modified) (2 diffs)
• menu.php (modified) (3 diffs)

trunk/wp-admin/admin-functions.php

@@ -1344 +1344 @@
 
         $parent = get_admin_page_parent();
-
+        /*echo "pa: $parent pn: $pagenow pp: $plugin_page<br/>";
+        echo "<pre>";
+        print_r($_wp_menu_nopriv);
+        print_r($_wp_submenu_nopriv);
+        echo "</pre>";*/
         if ( isset($_wp_submenu_nopriv[$parent][$pagenow]) )
                 return false;
@@ -1351 +1355 @@
                 return false;
         
-        //if ( empty($parent) )
-                //return false;
+        if ( empty($parent) ) {
+                if ( isset($_wp_menu_nopriv[$pagenow]) )
+                        return false;
+                if ( isset($_wp_submenu_nopriv[$pagenow][$pagenow]) )
+                        return false;
+                if ( isset($plugin_page) && isset($_wp_submenu_nopriv[$pagenow][$plugin_page]) )
+                        return false;
+                foreach (array_keys($_wp_submenu_nopriv) as $key) {
+                        if ( isset($_wp_submenu_nopriv[$key][$pagenow]) )
+                                return false;
+                        if ( isset($plugin_page) && isset($_wp_submenu_nopriv[$key][$plugin_page]) )
+                        return false;   
+                }
+                return true;
+        }
 
         if (isset ($submenu[$parent])) {

trunk/wp-admin/menu.php

@@ -70 +70 @@
 }
 
+$_wp_submenu_nopriv = array();
+$_wp_menu_nopriv = array();
 // Loop over submenus and remove pages for which the user does not have privs.
 foreach ($submenu as $parent => $sub) {
@@ -75 +77 @@
                 if ( ! current_user_can($data[1]) ) {
                         unset($submenu[$parent][$index]);
+                        $_wp_submenu_nopriv[$parent][$data[2]] = true;
                 }
         }
@@ -119 +122 @@
                         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 ) {
-                        $_wp_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]);
-                        $_wp_submenu_nopriv[$new_parent] = $_wp_submenu_nopriv[$old_parent];
-                } */
         }
 }