diff options
| author | Julius Härtl <jus@bitgrid.net> | 2020-07-21 09:16:43 +0200 |
|---|---|---|
| committer | backportbot[bot] <backportbot[bot]@users.noreply.github.com> | 2020-07-21 11:44:58 +0000 |
| commit | ba55e0ad535393e072bf4865c1dda19ba7c19ad4 (patch) | |
| tree | a19654deab3caeed5f30d3166015111060db73f4 /apps/encryption | |
| parent | 0a90eeb62cf746261412ac6dd7cd7b046bd1cf71 (diff) | |
| download | nextcloud-server-ba55e0ad535393e072bf4865c1dda19ba7c19ad4.tar.gz nextcloud-server-ba55e0ad535393e072bf4865c1dda19ba7c19ad4.zip | |
Encryption is ready if master key is enabled
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'apps/encryption')
| -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); } |