From 0e6238c66fc5f37b11800e632dbcccd72833628f Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 20 Jul 2012 17:57:18 +0200
Subject: [PATCH] fix OC_Cache_File tests if encryption is not enabled

---
 tests/lib/cache/file.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/lib/cache/file.php b/tests/lib/cache/file.php
index 54e60e6569d..c33c513fcff 100644
--- a/tests/lib/cache/file.php
+++ b/tests/lib/cache/file.php
@@ -30,8 +30,10 @@ class Test_Cache_File extends Test_Cache {
 		OC_FileProxy::clearProxies();
 		OC_Hook::clear('OC_Filesystem');
 		
-		//enable only the encryption hook
-		OC_FileProxy::register(new OC_FileProxy_Encryption());
+		//enable only the encryption hook if needed
+		if(OC_App::isEnabled('files_encryption')){
+			OC_FileProxy::register(new OC_FileProxy_Encryption());
+		}
 		
 		//set up temporary storage
 		OC_Filesystem::clearMounts();
-- 
GitLab