- adding default value for $recoveryPassword

- set password correctly in lost password

diff --git a/core/lostpassword/controller/lostcontroller.php b/core/lostpassword/controller/lostcontroller.php
index b1be65b4f01968e0fe1d3fd0921736f68e9e32cf..e4d51fde077b8c8c8aa1a3356c1d53e8e5d13ea5 100644 (file)
--- 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();
                        }
 

diff --git a/lib/private/user/user.php b/lib/private/user/user.php
index f9c2cb4d130e98a63cf7a04ee14b8c2d01bb05c5..993fb4c0c64531bc26e2af3cf45b8050bac2bd8a 100644 (file)
--- a/lib/private/user/user.php
+++ b/lib/private/user/user.php
@@ -156,7 +156,7 @@ class User implements IUser {
         * @param string $recoveryPassword for the encryption app to reset encryption keys
         * @return bool
         */
-       public function setPassword($password, $recoveryPassword) {
+       public function setPassword($password, $recoveryPassword = null) {
                if ($this->emitter) {
                        $this->emitter->emit('\OC\User', 'preSetPassword', array($this, $password, $recoveryPassword));
                }

diff --git a/lib/public/iuser.php b/lib/public/iuser.php
index dc4acc7658fdc0445d8f1d77e9443a8806e2ee8d..c15edcd14ddc9de6985b83075c5070436e6054cd 100644 (file)
--- a/lib/public/iuser.php
+++ b/lib/public/iuser.php
@@ -18,14 +18,14 @@ interface IUser {
        public function getUID();
 
        /**
-        * get the displayname for the user, if no specific displayname is set it will fallback to the user id
+        * get the display name for the user, if no specific display name is set it will fallback to the user id
         *
         * @return string
         */
        public function getDisplayName();
 
        /**
-        * set the displayname for the user
+        * set the display name for the user
         *
         * @param string $displayName
         * @return bool
@@ -59,7 +59,7 @@ interface IUser {
         * @param string $recoveryPassword for the encryption app to reset encryption keys
         * @return bool
         */
-       public function setPassword($password, $recoveryPassword);
+       public function setPassword($password, $recoveryPassword = null);
 
        /**
         * get the users home folder to mount