Ticket #3152: 3152.diff

wp-admin/admin-db.php

@@ -47 +47 @@
 
         if ( ! $user->has_cap('edit_others_posts') ) {
                 if ( $user->has_cap('edit_posts') || $exclude_zeros == false )
-                        return array($user->id);
+                        return array($user->ID);
                 else 
                         return false;
         }

wp-admin/users.php

@@ -136 +136 @@
                 if ( ! current_user_can('edit_user', $id) )
                         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;
                 }
@@ -168 +168 @@
                 if ( ! current_user_can('delete_user', $id) )
                         wp_die(__('You can’t delete that user.'));
 
-                if($id == $current_user->id) {
+                if($id == $current_user->ID) {
                         $update = 'err_admin_del';
                         continue;
                 }
@@ -214 +214 @@
         $go_delete = false;
         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 {
                         echo "<li><input type=\"hidden\" name=\"users[]\" value=\"{$id}\" />" . sprintf(__('ID #%1s: %2s'), $id, $user->user_login) . "</li>\n";
@@ -224 +224 @@
         $all_logins = $wpdb->get_results("SELECT ID, user_login FROM $wpdb->users ORDER BY user_login");
         $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>';
         ?>

wp-includes/capabilities.php

@@ -130 +130 @@
 
 class WP_User {
         var $data;
-        var $id = 0;
+        var $ID = 0;
+        var $id = 0; // Deprecated, use $ID instead.
         var $caps = array();
         var $cap_key;
         var $roles = array();
@@ -193 +194 @@
 
         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();
         }
@@ -202 +203 @@
                 if ( empty($this->roles[$role]) || (count($this->roles) <= 1) )
                         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();
         }
 
@@ -215 +216 @@
                 } else {
                         $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();
         }
@@ -232 +233 @@
         function update_user_level_from_caps() {
             global $wpdb;
             $this->user_level = array_reduce(array_keys($this->allcaps),        array(&$this, 'level_reduction'), 0);
-            update_usermeta($this->id, $wpdb->prefix.'user_level', $this->user_level);
+            update_usermeta($this->ID, $wpdb->prefix.'user_level', $this->user_level);
         }
 
         function add_cap($cap, $grant = true) {
                 $this->caps[$cap] = $grant;
-                update_usermeta($this->id, $this->cap_key, $this->caps);
+                update_usermeta($this->ID, $this->cap_key, $this->caps);
         }
 
         function remove_cap($cap) {
                 if ( empty($this->caps[$cap]) ) return;
                 unset($this->caps[$cap]);
-                update_usermeta($this->id, $this->cap_key, $this->caps);
+                update_usermeta($this->ID, $this->cap_key, $this->caps);
         }
 
         function remove_all_caps() {
                 global $wpdb;
                 $this->caps = array();
-                update_usermeta($this->id, $this->cap_key, '');
-                update_usermeta($this->id, $wpdb->prefix.'user_level', '');
+                update_usermeta($this->ID, $this->cap_key, '');
+                update_usermeta($this->ID, $wpdb->prefix.'user_level', '');
                 $this->get_role_caps();
         }
 
@@ -261 +262 @@
                         $cap = $this->translate_level_to_cap($cap);
 
                 $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
                 $capabilities = apply_filters('user_has_cap', $this->allcaps, $caps, $args);