Changeset 4504

Timestamp:

11/20/06 04:29:06 (2 years ago)

Author:

ryan

Message:

ID instead of id. Props Nazgul. fixes #3152

Files:

• trunk/wp-admin/users.php (modified) (4 diffs)
• trunk/wp-includes/capabilities.php (modified) (5 diffs)

trunk/wp-admin/users.php

@@ -136 +136 @@
-            wp_die(__('You can’t edit that user.'));
-        // The new role of the current user must also have edit_users caps
-id
+ID
-            $update = 'err_admin_role';
-            continue;
@@ -170 +170 @@
-            wp_die(__('You can’t delete that user.'));
-
-id
+ID
-            $update = 'err_admin_del';
-            continue;
@@ -218 +218 @@
-    foreach ( (array) $userids as $id ) {
-        $user = new WP_User($id);
-id
+ID
-            echo "<li>" . sprintf(__('ID #%1s: %2s <strong>The current user will not be deleted.</strong>'), $id, $user->user_login) . "</li>\n";
-        } else {
@@ -228 +228 @@
-    $user_dropdown = '<select name="reassign_user">';
-    foreach ( (array) $all_logins as $login )
-id
+ID
-            $user_dropdown .= "<option value=\"{$login->ID}\">{$login->user_login}</option>";
-    $user_dropdown .= '</select>';

trunk/wp-includes/capabilities.php

@@ -131 +131 @@
-class WP_User {
-    var $data;
-
+
+
-    var $caps = array();
-    var $cap_key;
@@ -194 +195 @@
-    function add_role($role) {
-        $this->caps[$role] = true;
-id
+ID
-        $this->get_role_caps();
-        $this->update_user_level_from_caps();
@@ -203 +204 @@
-            return;
-        unset($this->caps[$role]);
-id
+ID
-        $this->get_role_caps();
-    }
@@ -216 +217 @@
-            $this->roles = false;
-        }
-id
+ID
-        $this->get_role_caps();
-        $this->update_user_level_from_caps();
@@ -262 +263 @@
-
-        $args = array_slice(func_get_args(), 1);
-id
+ID
-        $caps = call_user_func_array('map_meta_cap', $args);
-        // Must have ALL requested caps