diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-03-05 11:16:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-05 11:16:27 +0100 |
| commit | a8f56ac8c71aa7854d2018f294eeb2e7e3e4d2eb (patch) | |
| tree | 4f448edcdecbcbdae4b3eff89aa6e1c11a2e2b99 /lib/private | |
| parent | 05ef2d70e7258ff8ba25eac32526a9e982980e3d (diff) | |
| parent | 8042e6b8fb0f0b4d3dd2c291729144f767575c56 (diff) | |
| download | nextcloud-server-a8f56ac8c71aa7854d2018f294eeb2e7e3e4d2eb.tar.gz nextcloud-server-a8f56ac8c71aa7854d2018f294eeb2e7e3e4d2eb.zip | |
Merge pull request #8603 from nextcloud/enc-cleanup
kill old encryption migration steps
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/Encryption/Manager.php | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/lib/private/Encryption/Manager.php b/lib/private/Encryption/Manager.php index fe34ef4555b..9bec1db73e3 100644 --- a/lib/private/Encryption/Manager.php +++ b/lib/private/Encryption/Manager.php @@ -101,15 +101,6 @@ class Manager implements IManager { * @throws ServiceUnavailableException */ public function isReady() { - // check if we are still in transit between the old and the new encryption - $oldEncryption = $this->config->getAppValue('files_encryption', 'installed_version'); - if (!empty($oldEncryption)) { - $warning = 'Installation is in transit between the old Encryption (ownCloud <= 8.0) - and the new encryption. Please enable the "Default encryption module" - and run \'occ encryption:migrate\''; - $this->logger->warning($warning); - return false; - } if ($this->isKeyStorageReady() === false) { throw new ServiceUnavailableException('Key Storage is not ready'); |