Changeset 4051 for branches/2.0/wp-admin/admin-functions.php

Timestamp:

07/26/2006 10:56:56 PM (20 years ago)

Author:

ryan

Message:

Menu and plugin tweaks.

File:

• branches/2.0/wp-admin/admin-functions.php (modified) (3 diffs)

branches/2.0/wp-admin/admin-functions.php

@@ -362 +362 @@
         $pass2 = $_POST['pass2'];
 
-    if (isset ($_POST['role'])) {
+    if (isset ($_POST['role']) && current_user_can('edit_users')) {
         if($user_id != $current_user->id || $wp_roles->role_objects[$_POST['role']]->has_cap('edit_users'))
             $user->role = $_POST['role'];
@@ -1215 +1215 @@
     global $menu;
     global $submenu;
+    global $plugin_page;
 
     $parent = get_admin_page_parent();
@@ -1230 +1231 @@
 
     if (isset ($submenu[$parent])) {
-        foreach ($submenu[$parent] as $submenu_array) {
+        if ( isset($plugin_page) ) {
+            foreach ($submenu[$parent] as $submenu_array) {
+                if ( $submenu_array[2] == $plugin_page ) {
+                    if (!current_user_can($submenu_array[1]))
+                        return false;
+                }
+            }
+        }
+
+        foreach ($submenu[$parent] as $submenu_array) {     
             if ($submenu_array[2] == $pagenow) {
-                if (!current_user_can($submenu_array[1])) {
+                if (!current_user_can($submenu_array[1]))
                     return false;
-                } else {
+                else
                     return true;
-                }
             }
         }