disable proxys before copying files to the trash bin

diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php
index 221c32f553d684e24a5ad9eff78c59b9e8f32127..661d5f7bba41d18e92f69e354ab6663dd3d60bd1 100644 (file)
--- a/apps/files_trashbin/lib/trash.php
+++ b/apps/files_trashbin/lib/trash.php
@@ -73,8 +73,12 @@ class Trashbin {
                if ( $trashbinSize === false || $trashbinSize < 0 ) {
                        $trashbinSize = self::calculateSize(new \OC\Files\View('/'. $user.'/files_trashbin'));
                }
-               
+
+               // disable proxy to prevent recursive calls
+               $proxyStatus = \OC_FileProxy::$enabled;
+               \OC_FileProxy::$enabled = false;
                $sizeOfAddedFiles = self::copy_recursive($file_path, 'files_trashbin/files/'.$filename.'.d'.$timestamp, $view);
+               \OC_FileProxy::$enabled = $proxyStatus;
 
                if ( $view->file_exists('files_trashbin/files/'.$filename.'.d'.$timestamp) ) {
                        $trashbinSize += $sizeOfAddedFiles;