From: Florin Peter <github@florin-peter.de>
Date: Thu, 18 Apr 2013 00:03:03 +0000 (+0200)
Subject: fix for trashbin
X-Git-Tag: v6.0.0alpha2~743^2~170^2~1^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2434739d699e2ca4316ea3aece86d7f609ff8e6d;p=nextcloud-server.git

fix for trashbin
---

diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 1e7ac609a4b..3af9dc73d83 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -254,6 +254,11 @@ class Proxy extends \OC_FileProxy {
 	 */
 	public function preUnlink( $path ) {
 	
+		// let the trashbin handle this  
+		if ( \OCP\App::isEnabled('files_trashbin') ) {
+		     return true;
+		}
+		
 		$path = Keymanager::fixPartialFilePath( $path );
 	
 		// Disable encryption proxy to prevent recursive calls