upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-08 16:26:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Merge pull request #27015 from nextcloud/backport/26980-stable21

Browse source 
[stable21] Use parent wrapper to properly handle moves on the same source/target storage
This commit is contained in:
blizzz 2021-06-07 12:22:55 +02:00 committed by GitHub
commit a18a3fe79e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/files_trashbin/lib/Storage.php
View file

@ -237,7 +237,7 @@ class Storage extends Wrapper {
/** @var Storage $sourceStorage */
$sourceStorage->disableTrash();
}
$result = $this->getWrapperStorage()->moveFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
$result = parent::moveFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
if ($sourceIsTrashbin) {
/** @var Storage $sourceStorage */
$sourceStorage->enableTrash();