diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-09-25 19:23:07 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-09-25 19:23:07 +0200 |
| commit | 0b98427536d9ff951577273af096c0a4ab219a83 (patch) | |
| tree | 6f2e28bdea917db9cb31f112fff964ce74678974 /apps/files_encryption | |
| parent | 71bbb2ea8bd76697cc1785fe4324b54973c410b9 (diff) | |
| download | nextcloud-server-0b98427536d9ff951577273af096c0a4ab219a83.tar.gz nextcloud-server-0b98427536d9ff951577273af096c0a4ab219a83.zip | |
fix check if app is enabled
Diffstat (limited to 'apps/files_encryption')
| -rw-r--r-- | apps/files_encryption/lib/proxy.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php index eb7ba60cb9d..4ec810a5199 100644 --- a/apps/files_encryption/lib/proxy.php +++ b/apps/files_encryption/lib/proxy.php @@ -50,9 +50,8 @@ class Proxy extends \OC_FileProxy { private static function shouldEncrypt($path) { if (is_null(self::$enableEncryption)) { - if ( - \OCP\Config::getAppValue('files_encryption', 'enable_encryption', 'true') === 'true' + \OCP\App::isEnabled('files_encryption') === true && Crypt::mode() === 'server' ) { @@ -200,7 +199,7 @@ class Proxy extends \OC_FileProxy { */ public function preUnlink($path) { - // let the trashbin handle this + // let the trashbin handle this if (\OCP\App::isEnabled('files_trashbin')) { return true; } @@ -291,7 +290,7 @@ class Proxy extends \OC_FileProxy { // Close the original encrypted file fclose($result); - // Open the file using the crypto stream wrapper + // Open the file using the crypto stream wrapper // protocol and let it do the decryption work instead $result = fopen('crypt://' . $path, $meta['mode']); |