From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Thu, 26 Sep 2013 14:27:14 +0000 (+0200)
Subject: check if encryption app is enabled before trying to calculate file size
X-Git-Tag: v6.0.0alpha2~95^2~9
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=62b8c36a40228192a936e823cda83c269147af91;p=nextcloud-server.git

check if encryption app is enabled before trying to calculate file size
---

diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 4ec810a5199..6f630c83a3f 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -317,7 +317,7 @@ class Proxy extends \OC_FileProxy {
 	public function postGetFileInfo($path, $data) {
 
 		// if path is a folder do nothing
-		if (is_array($data) && array_key_exists('size', $data)) {
+		if (\OCP\App::isEnabled('files_encryption') && is_array($data) && array_key_exists('size', $data)) {
 
 			// Disable encryption proxy to prevent recursive calls
 			$proxyStatus = \OC_FileProxy::$enabled;