WordPress 4.0.1

[autoinstallsdev/wordpress.git] / wp-includes / user.php

diff --git a/wp-includes/user.php b/wp-includes/user.php
index af0286457faa968be1d224782c13c9040744c043..4244642ce143e82fc8143d03ffcadafe81aa449f 100644 (file)
--- a/wp-includes/user.php
+++ b/wp-includes/user.php
@@ -1818,6 +1818,9 @@ function wp_insert_user( $userdata ) {
        $data = wp_unslash( $compacted );
 
        if ( $update ) {
+               if ( $user_email !== $old_user_data->user_email ) {
+                       $data['user_activation_key'] = '';
+               }
                $wpdb->update( $wpdb->users, $data, compact( 'ID' ) );
                $user_id = (int) $ID;
        } else {