diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2020-07-21 13:42:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-21 13:42:26 +0200 |
| commit | 24889128cc26aad6163c063de1c19ec6c311e93f (patch) | |
| tree | 737b81f0cd8cbc3142983bccf995acc85f8e703b | |
| parent | baa5e9fcfa526ad4e44a74a23b6890a7e14ece65 (diff) | |
| parent | fc1596fada4591c8c87306241fbcf0e2c0229d7d (diff) | |
| download | nextcloud-server-24889128cc26aad6163c063de1c19ec6c311e93f.tar.gz nextcloud-server-24889128cc26aad6163c063de1c19ec6c311e93f.zip | |
Merge pull request #21929 from nextcloud/bugfix/noid/encryption-transfer-user
Encryption is ready if master key is enabled
| -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); } |