From a8b6cc6a072db265a587ae0bb6b2512e2f56e06d Mon Sep 17 00:00:00 2001
From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Thu, 24 Jul 2014 12:50:39 +0200
Subject: - adding default value for $recoveryPassword - set password correctly
 in lost password

---
 core/lostpassword/controller/lostcontroller.php | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

(limited to 'core')

diff --git a/core/lostpassword/controller/lostcontroller.php b/core/lostpassword/controller/lostcontroller.php
index b1be65b4f01..e4d51fde077 100644
--- a/core/lostpassword/controller/lostcontroller.php
+++ b/core/lostpassword/controller/lostcontroller.php
@@ -20,13 +20,36 @@ use \OC\Core\LostPassword\EncryptedDataException;
 
 class LostController extends Controller {
 
+	/**
+	 * @var \OCP\IURLGenerator
+	 */
 	protected $urlGenerator;
+
+	/**
+	 * @var \OCP\IUserManager
+	 */
 	protected $userManager;
+
+	/**
+	 * @var \OC_Defaults
+	 */
 	protected $defaults;
+
+	/**
+	 * @var IL10N
+	 */
 	protected $l10n;
 	protected $from;
 	protected $isDataEncrypted;
+
+	/**
+	 * @var IConfig
+	 */
 	protected $config;
+
+	/**
+	 * @var IUserSession
+	 */
 	protected $userSession;
 
 	public function __construct($appName,
@@ -110,7 +133,7 @@ class LostController extends Controller {
 				throw new \Exception($this->l10n->t('Couldn\'t reset password because the token is invalid'));
 			}
 
-			if (!$user->setPassword($userId, $password)) {
+			if (!$user->setPassword($password)) {
 				throw new \Exception();
 			}
 
-- 
cgit v1.2.3