diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-04-08 11:10:00 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-04-08 11:10:00 +0200 |
| commit | dfc0a26e57effbb9c53f383b0c7a5f55323bf810 (patch) | |
| tree | 50c4e37273e997c293475f58a39366f8f1b45f8c | |
| parent | 6c327f8331617652ef0b268d51edc6a23624e33c (diff) | |
| parent | 215a9bcbc3b95a97ef2a088eb195ec6bfa866167 (diff) | |
| download | nextcloud-server-dfc0a26e57effbb9c53f383b0c7a5f55323bf810.tar.gz nextcloud-server-dfc0a26e57effbb9c53f383b0c7a5f55323bf810.zip | |
Merge pull request #15453 from owncloud/enc2_fix
fix function call
| -rw-r--r-- | apps/encryption/lib/crypto/encryption.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/apps/encryption/lib/crypto/encryption.php b/apps/encryption/lib/crypto/encryption.php index 1409a95b954..04b7b83b0c2 100644 --- a/apps/encryption/lib/crypto/encryption.php +++ b/apps/encryption/lib/crypto/encryption.php @@ -276,12 +276,11 @@ class Encryption implements IEncryptionModule { } if ($this->keyManager->recoveryKeyExists() && - $this->util->recoveryEnabled($this->user)) { + $this->util->isRecoveryEnabledForUser()) { $publicKeys[$this->keyManager->getRecoveryKeyId()] = $this->keyManager->getRecoveryKey(); } - return $publicKeys; } |