fix for trashbin

2013-04-18 02:03:03 +07:00 · 2013-04-18 02:03:03 +07:00 · 2434739d69
parent 6dd8c79461
commit 2434739d69
1 changed files with 5 additions and 0 deletions
--- 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