Ticket #32428: 32428.diff

src/wp-includes/pluggable.php

@@ -1692 +1692 @@
  * @param int    $user_id        User ID.
  * @param string $plaintext_pass Optional. The user's plaintext password. Default empty.
  */
-function wp_new_user_notification($user_id, $plaintext_pass = '') {
+function wp_new_user_notification( $user_id, $plaintext_pass = '' ) {
+        global $wpdb, $wp_hasher;
         $user = get_userdata( $user_id );
 
         // The blogname option is escaped with esc_html on the way into the database in sanitize_option
         // we want to reverse this for the plain text arena of emails.
-        $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
+        $blogname = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
 
-        $message  = sprintf(__('New user registration on your site %s:'), $blogname) . "\r\n\r\n";
-        $message .= sprintf(__('Username: %s'), $user->user_login) . "\r\n\r\n";
-        $message .= sprintf(__('E-mail: %s'), $user->user_email) . "\r\n";
+        $message  = sprintf( __( 'New user registration on your site %s:' ), $blogname ) . "\r\n\r\n";
+        $message .= sprintf( __( 'Username: %s' ), $user->user_login ) . "\r\n\r\n";
+        $message .= sprintf( __( 'E-mail: %s' ), $user->user_email ) . "\r\n";
 
-        @wp_mail(get_option('admin_email'), sprintf(__('[%s] New User Registration'), $blogname), $message);
+        @wp_mail( get_option( 'admin_email' ), sprintf( __( '[%s] New User Registration' ), $blogname ), $message );
 
-        if ( empty($plaintext_pass) )
+        if ( empty( $plaintext_pass ) ) {
                 return;
+        }
 
-        $message  = sprintf(__('Username: %s'), $user->user_login) . "\r\n";
-        $message .= sprintf(__('Password: %s'), $plaintext_pass) . "\r\n";
-        $message .= wp_login_url() . "\r\n";
+        $key = wp_generate_password( 20, false );
+        $hashed = $wp_hasher->HashPassword( $key );
+        $wpdb->update( $wpdb->users, array( 'user_activation_key' => $hashed ), array( 'user_login' => $user->user_login ) );
+        $link = network_site_url( "wp-login.php?action=rp&key=$key&login=" . rawurlencode( $user->user_login ), 'login' );
 
-        wp_mail($user->user_email, sprintf(__('[%s] Your username and password'), $blogname), $message);
+        $message  = sprintf( __( 'Username: %s' ), $user->user_login ) . "\r\n";
+        $message .= sprintf( __( 'Set Password: %s' ), $link ) . "\r\n";
 
+        wp_mail( $user->user_email, sprintf( __( '[%s] Your username and password' ), $blogname ), $message );
 }
 endif;