diff options
| author | blizzz <blizzz@arthur-schiwon.de> | 2021-06-07 12:22:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-07 12:22:55 +0200 |
| commit | a18a3fe79eff1170f26ccd1eb682dcbd0d42c42a (patch) | |
| tree | 6e13033b513b5e99c7854a45428ee71998e28309 /apps/files_trashbin | |
| parent | 4136993f4403c80f61aa8802a8ce3d7e892d890a (diff) | |
| parent | 553f8aff6b10bbb485ff3d3f0ec31801e2a66e51 (diff) | |
| download | nextcloud-server-a18a3fe79eff1170f26ccd1eb682dcbd0d42c42a.tar.gz nextcloud-server-a18a3fe79eff1170f26ccd1eb682dcbd0d42c42a.zip | |
Merge pull request #27015 from nextcloud/backport/26980-stable21
[stable21] Use parent wrapper to properly handle moves on the same source/target storage
Diffstat (limited to 'apps/files_trashbin')
| -rw-r--r-- | apps/files_trashbin/lib/Storage.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_trashbin/lib/Storage.php b/apps/files_trashbin/lib/Storage.php index 08dc052fa5c..415f8a183b2 100644 --- a/apps/files_trashbin/lib/Storage.php +++ b/apps/files_trashbin/lib/Storage.php @@ -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(); |