diff options
author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-05-19 11:13:33 +0200 |
---|---|---|
committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-05-19 11:13:33 +0200 |
commit | d90b83725f87825a68b51a32228270d9e9a82ac6 (patch) | |
tree | 350792cbaaeaf7e2af9aff2d56e4480463ed5fb5 /lib/private/encryption | |
parent | 9e0cb4460e82a59f238b6aed0e171954ecbda2de (diff) | |
parent | 35292eb66cdfa263ce5e6225ae871167378ee98b (diff) | |
download | nextcloud-server-d90b83725f87825a68b51a32228270d9e9a82ac6.tar.gz nextcloud-server-d90b83725f87825a68b51a32228270d9e9a82ac6.zip |
Merge pull request #16085 from owncloud/encryption-module-rename
rename to 'Default encryption module'
Diffstat (limited to 'lib/private/encryption')
-rw-r--r-- | lib/private/encryption/manager.php | 2 | ||||
-rw-r--r-- | lib/private/encryption/util.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/encryption/manager.php b/lib/private/encryption/manager.php index 1a42646daf6..45f45045643 100644 --- a/lib/private/encryption/manager.php +++ b/lib/private/encryption/manager.php @@ -79,7 +79,7 @@ class Manager implements IManager { $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 "ownCloud Default Encryption Module" + and the new encryption. Please enable the "Default encryption module" and run \'occ encryption:migrate\''; $this->logger->warning($warning); return false; diff --git a/lib/private/encryption/util.php b/lib/private/encryption/util.php index 45d4dd90d9f..b77672d2f6b 100644 --- a/lib/private/encryption/util.php +++ b/lib/private/encryption/util.php @@ -114,7 +114,7 @@ class Util { // ownCloud <= 8.0 with the old encryption $id = \OCA\Encryption\Crypto\Encryption::ID; } else { - throw new ModuleDoesNotExistsException('ownCloud default encryption module missing'); + throw new ModuleDoesNotExistsException('Default encryption module missing'); } } |