golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ID instead of id. Props Nazgul. fixes #3152 

git-svn-id: http://svn.automattic.com/wordpress/trunk@4504 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2006-11-20 04:29:06 +00:00
parent bb0d086933
commit 9a8391315a
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-admin/users.php
View File

@ -135,7 +135,7 @@ case 'promote':
if ( ! current_user_can('edit_user', $id) ) if ( ! current_user_can('edit_user', $id) )
wp_die(__('You can’t edit that user.')); wp_die(__('You can’t edit that user.'));
// The new role of the current user must also have edit_users caps // 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'; $update = 'err_admin_role';
continue; continue;
} }
@ -169,7 +169,7 @@ case 'dodelete':
if ( ! current_user_can('delete_user', $id) ) if ( ! current_user_can('delete_user', $id) )
wp_die(__('You can’t delete that user.')); wp_die(__('You can’t delete that user.'));
if($id == $current_user->id) { if($id == $current_user->ID) {
$update = 'err_admin_del'; $update = 'err_admin_del';
continue; continue;
} }
@ -217,7 +217,7 @@ case 'delete':
$go_delete = false; $go_delete = false;
foreach ( (array) $userids as $id ) { foreach ( (array) $userids as $id ) {
$user = new WP_User($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"; echo "<li>" . sprintf(__('ID #%1s: %2s <strong>The current user will not be deleted.</strong>'), $id, $user->user_login) . "</li>\n";
} else { } else {
echo "<li><input type=\"hidden\" name=\"users[]\" value=\"{$id}\" />" . sprintf(__('ID #%1s: %2s'), $id, $user->user_login) . "</li>\n"; echo "<li><input type=\"hidden\" name=\"users[]\" value=\"{$id}\" />" . sprintf(__('ID #%1s: %2s'), $id, $user->user_login) . "</li>\n";
@ -227,7 +227,7 @@ case 'delete':
$all_logins = $wpdb->get_results("SELECT ID, user_login FROM $wpdb->users ORDER BY user_login"); $all_logins = $wpdb->get_results("SELECT ID, user_login FROM $wpdb->users ORDER BY user_login");
$user_dropdown = '<select name="reassign_user">'; $user_dropdown = '<select name="reassign_user">';
foreach ( (array) $all_logins as $login ) 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 .= "<option value=\"{$login->ID}\">{$login->user_login}</option>";
$user_dropdown .= '</select>'; $user_dropdown .= '</select>';
?> ?>

11
wp-includes/capabilities.php
View File

@ -130,7 +130,8 @@ class WP_Role {
class WP_User { class WP_User {
var $data; var $data;
var $id = 0; var $ID = 0;
var $id = 0; // Deprecated, use $ID instead.
var $caps = array(); var $caps = array();
var $cap_key; var $cap_key;
var $roles = array(); var $roles = array();
@ -193,7 +194,7 @@ class WP_User {
function add_role($role) { function add_role($role) {
$this->caps[$role] = true; $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->get_role_caps();
$this->update_user_level_from_caps(); $this->update_user_level_from_caps();
} }
@ -202,7 +203,7 @@ class WP_User {
if ( empty($this->roles[$role]) || (count($this->roles) <= 1) ) if ( empty($this->roles[$role]) || (count($this->roles) <= 1) )
return; return;
unset($this->caps[$role]); 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(); $this->get_role_caps();
} }
@ -215,7 +216,7 @@ class WP_User {
} else { } else {
$this->roles = false; $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->get_role_caps();
$this->update_user_level_from_caps(); $this->update_user_level_from_caps();
} }
@ -261,7 +262,7 @@ class WP_User {
$cap = $this->translate_level_to_cap($cap); $cap = $this->translate_level_to_cap($cap);
$args = array_slice(func_get_args(), 1); $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); $caps = call_user_func_array('map_meta_cap', $args);
// Must have ALL requested caps // Must have ALL requested caps
$capabilities = apply_filters('user_has_cap', $this->allcaps, $caps, $args); $capabilities = apply_filters('user_has_cap', $this->allcaps, $caps, $args);