diff options
| author | Julius Härtl <jus@bitgrid.net> | 2020-07-21 09:16:43 +0200 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2020-07-21 09:16:43 +0200 |
| commit | fc1596fada4591c8c87306241fbcf0e2c0229d7d (patch) | |
| tree | 34ce13ace61946618188a81c4669f5bd8be8425a | |
| parent | 09e6b26bdd5d30c27e0da9576f5ead139634b33d (diff) | |
| download | nextcloud-server-fc1596fada4591c8c87306241fbcf0e2c0229d7d.tar.gz nextcloud-server-fc1596fada4591c8c87306241fbcf0e2c0229d7d.zip | |
Encryption is ready if master key is enabled
Signed-off-by: Julius Härtl <jus@bitgrid.net>
| -rw-r--r-- | apps/encryption/lib/Crypto/Encryption.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/apps/encryption/lib/Crypto/Encryption.php b/apps/encryption/lib/Crypto/Encryption.php index 39dfece7629..7f7a3c9ea20 100644 --- a/apps/encryption/lib/Crypto/Encryption.php +++ b/apps/encryption/lib/Crypto/Encryption.php @@ -580,6 +580,9 @@ class Encryption implements IEncryptionModule { * @since 9.1.0 */ public function isReadyForUser($user) { + if ($this->util->isMasterKeyEnabled()) { + return true; + } return $this->keyManager->userHasKeys($user); } |