Ticket #10589: email.diff

wp-login.php

@@ -193 +193 @@
         if ( empty($login) || !is_string($login) )
                 return new WP_Error('invalid_key', __('Invalid key'));
 
-        $user = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->users WHERE user_activation_key = %s AND user_login = %s", $key, $login));
+        $user = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->users WHERE user_activation_key = %s AND ( user_login = %s OR user_email = %s )", $key, $login, $login));
         if ( empty( $user ) )
                 return new WP_Error('invalid_key', __('Invalid key'));