From b0bf620c6167b591fbb30b6245bc58075ab4d7f2 Mon Sep 17 00:00:00 2001
From: Mikael Nordfeldth <mmn@hethane.se>
Date: Wed, 30 Dec 2015 17:53:43 +0100
Subject: [PATCH] RecoverpasswordAction uses User->setPassword()

---
 actions/recoverpassword.php | 11 +----------
 1 file changed, 1 insertion(+), 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();