From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Wed, 25 Sep 2013 17:23:07 +0000 (+0200)
Subject: fix check if app is enabled
X-Git-Tag: v5.0.13~32
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4ffec16ea765362ef3df6d1150b070c41df01a80;p=nextcloud-server.git

fix check if app is enabled

Conflicts:
	apps/files_encryption/lib/proxy.php
---

diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 509e3a5aece..a8e0da3ca6c 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -52,7 +52,7 @@ class Proxy extends \OC_FileProxy {
 		if (is_null(self::$enableEncryption)) {
 
 			if (
-				\OCP\Config::getAppValue('files_encryption', 'enable_encryption', 'true') === 'true'
+				\OCP\App::isEnabled('files_encryption') === true
 				&& Crypt::mode() === 'server'
 			) {
 
@@ -203,7 +203,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;
 		}
@@ -294,7 +294,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://' . $relativePath, $meta['mode']);