diff options
author | Lukas Fleischer <lfleischer@archlinux.org> | 2017-02-26 10:30:16 +0100 |
---|---|---|
committer | Lukas Fleischer <lfleischer@archlinux.org> | 2017-02-26 10:30:16 +0100 |
commit | 69f7eb115a0a48d4d2808708bcfef9eaf292f64c (patch) | |
tree | e8e4ac633b88099b6836ba3f637b0ab2b1d6a472 /web/html/passreset.php | |
parent | fdd932ff8d5e5899cfeae9a8b29011fa2cf9d439 (diff) | |
parent | 5fd417d70154470d145c83a4b60693c8d877b016 (diff) | |
download | aur-69f7eb115a0a48d4d2808708bcfef9eaf292f64c.tar.gz aur-69f7eb115a0a48d4d2808708bcfef9eaf292f64c.tar.xz |
Merge branch 'master' into maint
Diffstat (limited to 'web/html/passreset.php')
-rw-r--r-- | web/html/passreset.php | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/web/html/passreset.php b/web/html/passreset.php index cb2f6bcd..e89967d4 100644 --- a/web/html/passreset.php +++ b/web/html/passreset.php @@ -34,10 +34,7 @@ if (isset($_GET['resetkey'], $_POST['email'], $_POST['password'], $_POST['confir } if (empty($error)) { - $salt = generate_salt(); - $hash = salted_hash($password, $salt); - - $error = password_reset($hash, $salt, $resetkey, $email); + $error = password_reset($password, $resetkey, $email); } } elseif (isset($_POST['email'])) { $email = $_POST['email']; |