Wordpress 3.6

[autoinstalls/wordpress.git] / wp-admin / includes / user.php

diff --git a/wp-admin/includes/user.php b/wp-admin/includes/user.php
index ff1e91dcebda385b51d6974ae2cea95201c93d80..9e9d94494c396c3df8f226d19a7c7fff83692b5e 100644 (file)
--- 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' ) ) {
@@ -69,7 +69,8 @@ function edit_user( $user_id = 0 ) {
                        $user->user_url = '';
                } else {
                        $user->user_url = esc_url_raw( $_POST['url'] );
-                       $user->user_url = preg_match('/^(https?|ftps?|mailto|news|irc|gopher|nntp|feed|telnet):/is', $user->user_url) ? $user->user_url : 'http://'.$user->user_url;
+                       $protocols = implode( '|', array_map( 'preg_quote', wp_allowed_protocols() ) );
+                       $user->user_url = preg_match('/^(' . $protocols . '):/is', $user->user_url) ? $user->user_url : 'http://'.$user->user_url;
                }
        }
        if ( isset( $_POST['first_name'] ) )
@@ -105,10 +106,10 @@ function edit_user( $user_id = 0 ) {
 
        /* checking that username has been typed */
        if ( $user->user_login == '' )
-               $errors->add( 'user_login', __( '<strong>ERROR</strong>: Please enter a username.' ));
+               $errors->add( 'user_login', __( '<strong>ERROR</strong>: 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) )
@@ -123,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', __( '<strong>ERROR</strong>: Passwords may not contain the character "\\".' ), array( 'form-field' => 'pass1' ) );
 
        /* checking the password has been typed twice the same */
@@ -143,22 +144,22 @@ function edit_user( $user_id = 0 ) {
        if ( empty( $user->user_email ) ) {
                $errors->add( 'empty_email', __( '<strong>ERROR</strong>: Please enter an e-mail address.' ), array( 'form-field' => 'email' ) );
        } elseif ( !is_email( $user->user_email ) ) {
-               $errors->add( 'invalid_email', __( '<strong>ERROR</strong>: The e-mail address isn&#8217;t correct.' ), array( 'form-field' => 'email' ) );
+               $errors->add( 'invalid_email', __( '<strong>ERROR</strong>: The email address isn&#8217;t correct.' ), array( 'form-field' => 'email' ) );
        } elseif ( ( $owner_id = email_exists($user->user_email) ) && ( !$update || ( $owner_id != $user->ID ) ) ) {
                $errors->add( 'email_exists', __('<strong>ERROR</strong>: This email is already registered, please choose another one.'), array( 'form-field' => 'email' ) );
        }
 
        // 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;
 
        if ( $update ) {
-               $user_id = wp_update_user( get_object_vars( $user ) );
+               $user_id = wp_update_user( $user );
        } else {
-               $user_id = wp_insert_user( get_object_vars( $user ) );
-               wp_new_user_notification( $user_id, isset($_POST['send_password']) ? $pass1 : '' );
+               $user_id = wp_insert_user( $user );
+               wp_new_user_notification( $user_id, isset( $_POST['send_password'] ) ? wp_unslash( $pass1 ) : '' );
        }
        return $user_id;
 }
@@ -197,7 +198,7 @@ function get_editable_roles() {
  * @return object WP_User object with user data.
  */
 function get_user_to_edit( $user_id ) {
-       $user = new WP_User( $user_id );
+       $user = get_userdata( $user_id );
 
        $user->filter = 'edit';
 
@@ -239,6 +240,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);
 
@@ -269,8 +273,18 @@ function wp_delete_user( $id, $reassign = 'novalue' ) {
                }
        } else {
                $reassign = (int) $reassign;
+               $post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_author = %d", $id ) );
                $wpdb->update( $wpdb->posts, array('post_author' => $reassign), array('post_author' => $id) );
+               if ( ! empty( $post_ids ) ) {
+                       foreach ( $post_ids as $post_id )
+                               clean_post_cache( $post_id );
+               }
+               $link_ids = $wpdb->get_col( $wpdb->prepare("SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $id) );
                $wpdb->update( $wpdb->links, array('link_owner' => $reassign), array('link_owner' => $id) );
+               if ( ! empty( $link_ids ) ) {
+                       foreach ( $link_ids as $link_id )
+                               clean_bookmark_cache( $link_id );
+               }
        }
 
        // FINALLY, delete user
@@ -333,7 +347,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);
        }
 }
@@ -352,7 +366,7 @@ function default_password_nag() {
        echo '<strong>' . __('Notice:') . '</strong> ';
        _e('You&rsquo;re using the auto-generated password for your account. Would you like to change it to something easier to remember?');
        echo '</p><p>';
-       printf( '<a href="%s">' . __('Yes, take me to my profile page') . '</a> | ', admin_url('profile.php') . '#password' );
+       printf( '<a href="%s">' . __('Yes, take me to my profile page') . '</a> | ', get_edit_profile_url( get_current_user_id() ) . '#password' );
        printf( '<a href="%s" id="default-password-nag-no">' . __('No thanks, do not remind me again') . '</a>', '?default_password_nag=0' );
        echo '</p></div>';
 }