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 /apps | |
| 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 'apps')
| -rw-r--r-- | apps/encryption/appinfo/info.xml | 2 | ||||
| -rw-r--r-- | apps/encryption/lib/crypto/encryption.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/encryption/appinfo/info.xml b/apps/encryption/appinfo/info.xml index 53a2459f864..8d3b680fc08 100644 --- a/apps/encryption/appinfo/info.xml +++ b/apps/encryption/appinfo/info.xml @@ -16,7 +16,7 @@ based on AES 128 or 256 bit keys. More information is available in the Encryption documentation </description> - <name>ownCloud Default Encryption Module</name> + <name>Default encryption module</name> <license>AGPL</license> <author>Bjoern Schiessle, Clark Tomlinson</author> <requiremin>8</requiremin> diff --git a/apps/encryption/lib/crypto/encryption.php b/apps/encryption/lib/crypto/encryption.php index df3f9a0997e..f527955b496 100644 --- a/apps/encryption/lib/crypto/encryption.php +++ b/apps/encryption/lib/crypto/encryption.php @@ -36,7 +36,7 @@ use OCP\ILogger; class Encryption implements IEncryptionModule { const ID = 'OC_DEFAULT_MODULE'; - const DISPLAY_NAME = 'ownCloud Default Encryption'; + const DISPLAY_NAME = 'Default encryption module'; /** * @var Crypt @@ -304,7 +304,7 @@ class Encryption implements IEncryptionModule { */ public function update($path, $uid, array $accessList) { $fileKey = $this->keyManager->getFileKey($path, $uid); - + if (!empty($fileKey)) { $publicKeys = array(); |