Changeset 3536 for trunk/wp-admin/admin-functions.php

Timestamp:

02/17/2006 12:57:10 AM (20 years ago)

Author:

ryan

Message:

Dynamic menu reparenting. fixes #2257

File:

• trunk/wp-admin/admin-functions.php (modified) (5 diffs)

trunk/wp-admin/admin-functions.php

@@ -1232 +1232 @@
     global $menu;
     global $submenu;
+    global $menu_nopriv;
 
     $parent = get_admin_page_parent();
+    
+    if ( isset($menu_nopriv[$pagenow]) )
+        return false;
+
+    if ( empty($parent) )
+        return true;
+
+    if (isset ($submenu[$parent])) {
+        foreach ($submenu[$parent] as $submenu_array) {
+            if ($submenu_array[2] == $pagenow) {
+                if (current_user_can($submenu_array[1]))
+                    return true;
+                else
+                    return false;
+            }
+        }
+    }
 
     foreach ($menu as $menu_array) {
         //echo "parent array: " . $menu_array[2];
         if ($menu_array[2] == $parent) {
-            if (!current_user_can($menu_array[1])) {
+            if (current_user_can($menu_array[1]))
+                return true;
+            else
                 return false;
-            } else {
-                break;
-            }
-        }
-    }
-
-    if (isset ($submenu[$parent])) {
-        foreach ($submenu[$parent] as $submenu_array) {
-            if ($submenu_array[2] == $pagenow) {
-                if (!current_user_can($submenu_array[1])) {
-                    return false;
-                } else {
-                    return true;
-                }
-            }
-        }
-    }
-
+        }
+    }
+    
     return true;
 }
@@ -1314 +1319 @@
     global $pagenow;
     global $plugin_page;
-
-    if (isset ($parent_file) && !empty ($parent_file)) {
+    global $real_parent_file;
+
+    if ( !empty ($parent_file) ) {
+        if ( isset($real_parent_file[$parent_file]) )
+            $parent_file = $real_parent_file[$parent_file];
+
         return $parent_file;
     }
@@ -1323 +1332 @@
             if ($parent_menu[2] == $plugin_page) {
                 $parent_file = $plugin_page;
-                return $plugin_page;
+                if ( isset($real_parent_file[$parent_file]) )
+                    $parent_file = $real_parent_file[$parent_file];
+                    
+                return $parent_file;
             }
         }
@@ -1330 +1342 @@
     foreach (array_keys($submenu) as $parent) {
         foreach ($submenu[$parent] as $submenu_array) {
+            if ( isset($real_parent_file[$parent]) )
+                $parent = $real_parent_file[$parent];
             if ($submenu_array[2] == $pagenow) {
                 $parent_file = $parent;
@@ -1364 +1378 @@
     global $submenu;
     global $menu;
+    global $real_parent_file;
 
     $parent = plugin_basename($parent);
+    if ( isset($real_parent_file[$parent]) )
+        $parent = $real_parent_file[$parent];
+
     $file = plugin_basename($file);