From 35292eb66cdfa263ce5e6225ae871167378ee98b Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Tue, 5 May 2015 22:08:16 +0200 Subject: rename to 'Default encryption module' --- apps/encryption/appinfo/info.xml | 2 +- apps/encryption/lib/crypto/encryption.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'apps') 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 - ownCloud Default Encryption Module + Default encryption module AGPL Bjoern Schiessle, Clark Tomlinson 8 diff --git a/apps/encryption/lib/crypto/encryption.php b/apps/encryption/lib/crypto/encryption.php index a4abcd7dc5a..1bc42ce032f 100644 --- a/apps/encryption/lib/crypto/encryption.php +++ b/apps/encryption/lib/crypto/encryption.php @@ -34,7 +34,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 @@ -287,7 +287,7 @@ class Encryption implements IEncryptionModule { */ public function update($path, $uid, array $accessList) { $fileKey = $this->keyManager->getFileKey($path, $uid); - + if (!empty($fileKey)) { $publicKeys = array(); -- cgit v1.2.3