fix for trashbin

diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 1e7ac609a4bc251ba2c89f5a8b72da5e9257edcd..3af9dc73d83610dff4dde8b6bf3443422bd94ceb 100644 (file)
--- 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