aboutsummaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authorMikael Nordfeldth <mmn@hethane.se>2015-12-30 17:53:43 +0100
committerMikael Nordfeldth <mmn@hethane.se>2015-12-30 17:53:43 +0100
commitb0bf620c6167b591fbb30b6245bc58075ab4d7f2 (patch)
tree43147a2ac540c93ee3e4ac76650833edc760c737 /actions
parent29847f172fd4ea72b535d1d436d7ec0589e8ecad (diff)
downloadgnu-social-b0bf620c6167b591fbb30b6245bc58075ab4d7f2.tar
gnu-social-b0bf620c6167b591fbb30b6245bc58075ab4d7f2.zip
RecoverpasswordAction uses User->setPassword()
Diffstat (limited to 'actions')
-rw-r--r--actions/recoverpassword.php11
1 files changed, 1 insertions, 10 deletions
diff --git a/actions/recoverpassword.php b/actions/recoverpassword.php
index 1cbb73fd4a..a3a5b8e5bc 100644
--- a/actions/recoverpassword.php
+++ b/actions/recoverpassword.php
@@ -322,16 +322,7 @@ class RecoverpasswordAction extends Action
}
// OK, we're ready to go
-
- $original = clone($user);
-
- $user->password = common_munge_password($newpassword, $user->getProfile());
-
- if (!$user->update($original)) {
- common_log_db_error($user, 'UPDATE', __FILE__);
- // TRANS: Reset password form validation error message.
- $this->serverError(_('Cannot save new password.'));
- }
+ $user->setPassword($newpassword);
$this->clearTempUser();