summaryrefslogtreecommitdiffstats
path: root/lib/private/user/user.php
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2014-07-24 12:50:39 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2014-07-24 12:50:39 +0200
commita8b6cc6a072db265a587ae0bb6b2512e2f56e06d (patch)
tree837a2cb32269fe4b7fac7110c09bdbe177cf3519 /lib/private/user/user.php
parente2327f83ed60ca29fd1513a40bcefd26e52c54bf (diff)
downloadnextcloud-server-a8b6cc6a072db265a587ae0bb6b2512e2f56e06d.tar.gz
nextcloud-server-a8b6cc6a072db265a587ae0bb6b2512e2f56e06d.zip
- adding default value for $recoveryPassword
- set password correctly in lost password
Diffstat (limited to 'lib/private/user/user.php')
-rw-r--r--lib/private/user/user.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/user/user.php b/lib/private/user/user.php
index f9c2cb4d130..993fb4c0c64 100644
--- 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));
}