X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/6c8f14c09105d0afa4c1574215c59b5021040e76..refs/tags/wordpress-3.7:/wp-admin/includes/user.php?ds=sidebyside
diff --git a/wp-admin/includes/user.php b/wp-admin/includes/user.php
index 1d60aa57..b61cb7ad 100644
--- a/wp-admin/includes/user.php
+++ b/wp-admin/includes/user.php
@@ -34,7 +34,7 @@ function edit_user( $user_id = 0 ) {
$update = true;
$user->ID = (int) $user_id;
$userdata = get_userdata( $user_id );
- $user->user_login = $wpdb->escape( $userdata->user_login );
+ $user->user_login = wp_slash( $userdata->user_login );
} else {
$update = false;
}
@@ -43,9 +43,9 @@ function edit_user( $user_id = 0 ) {
$user->user_login = sanitize_user($_POST['user_login'], true);
$pass1 = $pass2 = '';
- if ( isset( $_POST['pass1'] ))
+ if ( isset( $_POST['pass1'] ) )
$pass1 = $_POST['pass1'];
- if ( isset( $_POST['pass2'] ))
+ if ( isset( $_POST['pass2'] ) )
$pass2 = $_POST['pass2'];
if ( isset( $_POST['role'] ) && current_user_can( 'edit_users' ) ) {
@@ -85,7 +85,7 @@ function edit_user( $user_id = 0 ) {
if ( isset( $_POST['description'] ) )
$user->description = trim( $_POST['description'] );
- foreach ( _wp_get_user_contactmethods( $user ) as $method => $name ) {
+ foreach ( wp_get_user_contact_methods( $user ) as $method => $name ) {
if ( isset( $_POST[$method] ))
$user->$method = sanitize_text_field( $_POST[$method] );
}
@@ -106,10 +106,10 @@ function edit_user( $user_id = 0 ) {
/* checking that username has been typed */
if ( $user->user_login == '' )
- $errors->add( 'user_login', __( 'ERROR: Please enter a username.' ));
+ $errors->add( 'user_login', __( 'ERROR: Please enter a username.' ) );
/* checking the password has been typed twice */
- do_action_ref_array( 'check_passwords', array ( $user->user_login, & $pass1, & $pass2 ));
+ do_action_ref_array( 'check_passwords', array( $user->user_login, &$pass1, &$pass2 ) );
if ( $update ) {
if ( empty($pass1) && !empty($pass2) )
@@ -124,7 +124,7 @@ function edit_user( $user_id = 0 ) {
}
/* Check for "\" in password */
- if ( false !== strpos( stripslashes($pass1), "\\" ) )
+ if ( false !== strpos( wp_unslash( $pass1 ), "\\" ) )
$errors->add( 'pass', __( 'ERROR: Passwords may not contain the character "\\".' ), array( 'form-field' => 'pass1' ) );
/* checking the password has been typed twice the same */
@@ -150,7 +150,7 @@ function edit_user( $user_id = 0 ) {
}
// Allow plugins to return their own errors.
- do_action_ref_array('user_profile_update_errors', array ( &$errors, $update, &$user ) );
+ do_action_ref_array( 'user_profile_update_errors', array( &$errors, $update, &$user ) );
if ( $errors->get_error_codes() )
return $errors;
@@ -159,7 +159,7 @@ function edit_user( $user_id = 0 ) {
$user_id = wp_update_user( $user );
} else {
$user_id = wp_insert_user( $user );
- wp_new_user_notification( $user_id, isset($_POST['send_password']) ? $pass1 : '' );
+ wp_new_user_notification( $user_id, isset( $_POST['send_password'] ) ? wp_unslash( $pass1 ) : '' );
}
return $user_id;
}
@@ -195,12 +195,13 @@ function get_editable_roles() {
* @since 2.0.5
*
* @param int $user_id User ID.
- * @return object WP_User object with user data.
+ * @return WP_User|bool WP_User object on success, false on failure.
*/
function get_user_to_edit( $user_id ) {
$user = get_userdata( $user_id );
- $user->filter = 'edit';
+ if ( $user )
+ $user->filter = 'edit';
return $user;
}
@@ -240,6 +241,9 @@ function wp_delete_user( $id, $reassign = 'novalue' ) {
$id = (int) $id;
$user = new WP_User( $id );
+ if ( !$user->exists() )
+ return false;
+
// allow for transaction statement
do_action('delete_user', $id);
@@ -344,7 +348,7 @@ function default_password_nag_edit_user($user_ID, $old_data) {
$new_data = get_userdata($user_ID);
if ( $new_data->user_pass != $old_data->user_pass ) { //Remove the nag if the password has been changed.
- delete_user_setting('default_password_nag', $user_ID);
+ delete_user_setting('default_password_nag');
update_user_option($user_ID, 'default_password_nag', false, true);
}
}