diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2015-01-21 16:29:52 +0100 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2015-01-23 12:20:54 +0100 |
| commit | 67f1534e0fd7c14e97fe5b17bd92aa2277520604 (patch) | |
| tree | 52b863953936295764a52036cebc1162a6507dfd /apps/files_encryption | |
| parent | 5fb8a4715d6ed34b1d94c5508700f3c488c0f734 (diff) | |
| download | nextcloud-server-67f1534e0fd7c14e97fe5b17bd92aa2277520604.tar.gz nextcloud-server-67f1534e0fd7c14e97fe5b17bd92aa2277520604.zip | |
Call final unlink in trash wrapper's storage
In the case of cross-storage delete, the files are copied to the trash,
then deleted. The final delete on the source storage would still reach
the trash wrapper.
This fix makes forwards that second call to the wrapped storage to make
the final delete work.
It fixes the issue with remote shares, local shares and external
storage.
Also, it uses a new function "renameRecursive" that renames the files
and preserves the mtimes (like "copy_recursive" did in the past))
Diffstat (limited to 'apps/files_encryption')
| -rwxr-xr-x | apps/files_encryption/tests/trashbin.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/apps/files_encryption/tests/trashbin.php b/apps/files_encryption/tests/trashbin.php index b759c8e32fd..2704a9752cc 100755 --- a/apps/files_encryption/tests/trashbin.php +++ b/apps/files_encryption/tests/trashbin.php @@ -93,6 +93,8 @@ class Trashbin extends TestCase { // cleanup test user \OC_User::deleteUser(self::TEST_ENCRYPTION_TRASHBIN_USER1); + \OC\Files\Filesystem::getLoader()->removeStorageWrapper('oc_trashbin'); + parent::tearDownAfterClass(); } |