From 5efbab4ab8b844051ad289dc0f8cb6f48604c971 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Tue, 9 Jun 2015 17:01:31 +0200 Subject: [PATCH] ensure we dont have to scan a file in the trash wrapper --- apps/files_trashbin/lib/trashbin.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php index 853bc1eda6..3a221bc2d0 100644 --- a/apps/files_trashbin/lib/trashbin.php +++ b/apps/files_trashbin/lib/trashbin.php @@ -55,6 +55,15 @@ class Trashbin { */ private static $scannedVersions = false; + /** + * Ensure we dont need to scan the file during the move to trash + * + * @param array $params + */ + public static function ensureFileScannedHook($params) { + self::getUidAndFilename($params['path']); + } + public static function getUidAndFilename($filename) { $uid = \OC\Files\Filesystem::getOwner($filename); \OC\Files\Filesystem::initMountPoints($uid); @@ -870,6 +879,7 @@ class Trashbin { //Listen to post write hook \OCP\Util::connectHook('OC_Filesystem', 'post_write', 'OCA\Files_Trashbin\Hooks', 'post_write_hook'); // pre and post-rename, disable trash logic for the copy+unlink case + \OCP\Util::connectHook('OC_Filesystem', 'delete', 'OCA\Files_Trashbin\Trashbin', 'ensureFileScannedHook'); \OCP\Util::connectHook('OC_Filesystem', 'rename', 'OCA\Files_Trashbin\Storage', 'preRenameHook'); \OCP\Util::connectHook('OC_Filesystem', 'post_rename', 'OCA\Files_Trashbin\Storage', 'postRenameHook'); }