diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2020-07-21 20:32:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-21 20:32:53 +0200 |
| commit | 970a160ca7b3e7c7541c9bdf51d99e8f4484ac79 (patch) | |
| tree | 88bd88517e839c9fd698865db611637d77170558 | |
| parent | 62a60afc8a10c98b7b5e3870df8fa1ecc4bd8a21 (diff) | |
| parent | 4035305088eaf789730cf2a776c9e547f460d72c (diff) | |
| download | nextcloud-server-970a160ca7b3e7c7541c9bdf51d99e8f4484ac79.tar.gz nextcloud-server-970a160ca7b3e7c7541c9bdf51d99e8f4484ac79.zip | |
Merge pull request #21936 from nextcloud/backport/21929/stable18
[stable18] 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 8b5ec5e1e05..35dc3ba8826 100644 --- a/apps/encryption/lib/Crypto/Encryption.php +++ b/apps/encryption/lib/Crypto/Encryption.php @@ -588,6 +588,9 @@ class Encryption implements IEncryptionModule { * @since 9.1.0 */ public function isReadyForUser($user) { + if ($this->util->isMasterKeyEnabled()) { + return true; + } return $this->keyManager->userHasKeys($user); } |