diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-08-14 22:24:15 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-08-14 22:24:15 -0700 |
| commit | 18bc12c21ceb6f8c4c92aefea41afa2c235500a8 (patch) | |
| tree | 781383a1001f4e33afd9df31d97bd15abbc54271 /mod | |
| parent | d1406200084b47deefe68637777e0b1851166cfe (diff) | |
| parent | 1d4dc7e27c6ca88110cdba0297c31bdb12079cbf (diff) | |
| download | volse-hubzilla-18bc12c21ceb6f8c4c92aefea41afa2c235500a8.tar.gz volse-hubzilla-18bc12c21ceb6f8c4c92aefea41afa2c235500a8.tar.bz2 volse-hubzilla-18bc12c21ceb6f8c4c92aefea41afa2c235500a8.zip | |
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/zot.php
util/messages.po
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/lostpass.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mod/lostpass.php b/mod/lostpass.php index 3269128f1..3dbc2fe7d 100644 --- a/mod/lostpass.php +++ b/mod/lostpass.php @@ -72,10 +72,11 @@ function lostpass_content(&$a) { $salt = random_string(32); $password_encoded = hash('whirlpool', $salt . $new_password); - - $r = q("UPDATE account SET account_salt = '%s', account_password = '%s', account_reset = '' where account_id = %d", + + $r = q("UPDATE account SET account_salt = '%s', account_password = '%s', account_reset = '', account_flags = (account_flags & ~%d) where account_id = %d", dbesc($salt), dbesc($password_encoded), + intval(ACCOUNT_UNVERIFIED), intval($aid) ); |