Make sure that a empty directory can still be deleted when copied fro…

…m another storage Signed-off-by: Julius Härtl <jus@bitgrid.net>
nextcloud · Nov 17, 2020 · 7129f2c · rullzer · Nov 17, 2020 · juliusknorr
1 parent 62c0009
commit 7129f2c
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/lib/private/Files/Storage/Common.php b/lib/private/Files/Storage/Common.php
@@ -612,6 +612,7 @@ public function copyFromStorage(IStorage $sourceStorage, $sourceInternalPath, $t
 			$dh = $sourceStorage->opendir($sourceInternalPath);
 			$result = $this->mkdir($targetInternalPath);
 			if (is_resource($dh)) {
+				$result = true;
 $trashStorage->getUpdater()->renameFromStorage($sourceStorage, $sourceInternalPath, $trashInternalPath); 
 $trashStorage->getUpdater()->renameFromStorage($sourceStorage, $sourceInternalPath, $trashInternalPath); 
 				while ($result and ($file = readdir($dh)) !== false) {
 					if (!Filesystem::isIgnoredDir($file)) {
 						$result &= $this->copyFromStorage($sourceStorage, $sourceInternalPath . '/' . $file, $targetInternalPath . '/' . $file);