Changeset 4504

Timestamp:

11/20/2006 04:29:06 AM (19 years ago)

Author:

ryan

Message:

ID instead of id. Props Nazgul. fixes #3152

Location:

trunk

Files:

• wp-admin/users.php (modified) (4 diffs)
• 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
-        if($id == $current_user->id && !$wp_roles->role_objects[$_POST['new_role']]->has_cap('edit_users')) {
+        if($id == $current_user->ID && !$wp_roles->role_objects[$_POST['new_role']]->has_cap('edit_users')) {
             $update = 'err_admin_role';
             continue;
@@ -170 +170 @@
             wp_die(__('You can’t delete that user.'));
 
-        if($id == $current_user->id) {
+        if($id == $current_user->ID) {
             $update = 'err_admin_del';
             continue;
@@ -218 +218 @@
     foreach ( (array) $userids as $id ) {
         $user = new WP_User($id);
-        if ( $id == $current_user->id ) {
+        if ( $id == $current_user->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 )
-        if ( $login->ID == $current_user->id || !in_array($login->ID, $userids) )
+        if ( $login->ID == $current_user->ID || !in_array($login->ID, $userids) )
             $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 $id = 0;
+    var $ID = 0;
+    var $id = 0; // Deprecated, use $ID instead.
     var $caps = array();
     var $cap_key;
@@ -194 +195 @@
     function add_role($role) {
         $this->caps[$role] = true;
-        update_usermeta($this->id, $this->cap_key, $this->caps);
+        update_usermeta($this->ID, $this->cap_key, $this->caps);
         $this->get_role_caps();
         $this->update_user_level_from_caps();
@@ -203 +204 @@
             return;
         unset($this->caps[$role]);
-        update_usermeta($this->id, $this->cap_key, $this->caps);
+        update_usermeta($this->ID, $this->cap_key, $this->caps);
         $this->get_role_caps();
     }
@@ -216 +217 @@
             $this->roles = false;
         }
-        update_usermeta($this->id, $this->cap_key, $this->caps);
+        update_usermeta($this->ID, $this->cap_key, $this->caps);
         $this->get_role_caps();
         $this->update_user_level_from_caps();
@@ -262 +263 @@
 
         $args = array_slice(func_get_args(), 1);
-        $args = array_merge(array($cap, $this->id), $args);
+        $args = array_merge(array($cap, $this->ID), $args);
         $caps = call_user_func_array('map_meta_cap', $args);
         // Must have ALL requested caps