bug #339 - lostpass sending to username, not email

diff --git a/mod/lostpass.php b/mod/lostpass.php
index b71398fa4b5b79e7c13619750ec3a6d66e984117..57e6d696537c24b3e5440d751b5e1fa6c4e6625a 100755 (executable)
--- a/mod/lostpass.php
+++ b/mod/lostpass.php
@@ -3,13 +3,13 @@
 
 function lostpass_post(&$a) {
 
-       $email = notags(trim($_POST['login-name']));
-       if(! $email)
+       $loginame = notags(trim($_POST['login-name']));
+       if(! $loginame)
                goaway(z_root());
 
        $r = q("SELECT * FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' ) AND `verified` = 1 AND `blocked` = 0 LIMIT 1",
-               dbesc($email),
-               dbesc($email)
+               dbesc($loginame),
+               dbesc($loginame)
        );
 
        if(! count($r)) {
@@ -19,6 +19,7 @@ function lostpass_post(&$a) {
 
        $uid = $r[0]['uid'];
        $username = $r[0]['username'];
+       $email = $r[0]['email'];
 
        $new_password = autoname(12) . mt_rand(100,9999);
        $new_password_encoded = hash('whirlpool',$new_password);