mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #15453 from owncloud/enc2_fix 

fix function call
This commit is contained in:
Morris Jobke 2015-04-08 11:10:00 +02:00
parent 6c327f8331 215a9bcbc3
commit dfc0a26e57
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/encryption/lib/crypto/encryption.php
View File

@ -276,12 +276,11 @@ class Encryption implements IEncryptionModule {
} }
if ($this->keyManager->recoveryKeyExists() && if ($this->keyManager->recoveryKeyExists() &&
$this->util->recoveryEnabled($this->user)) { $this->util->isRecoveryEnabledForUser()) {
$publicKeys[$this->keyManager->getRecoveryKeyId()] = $this->keyManager->getRecoveryKey(); $publicKeys[$this->keyManager->getRecoveryKeyId()] = $this->keyManager->getRecoveryKey();
} }
return $publicKeys; return $publicKeys;
} }