diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2021-08-14 09:28:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-14 09:28:16 +0200 |
| commit | fd1296856b76984152ecce94e873e4d6f6e33941 (patch) | |
| tree | c25e1ddf6dd404de11d243784747f18ef8bdff7d | |
| parent | b61bb729c2c3143e2158061c50215919f64aa6f9 (diff) | |
| parent | bc3c46362abfb569a1919cdfca2762a0d15d520c (diff) | |
| download | nextcloud-server-fd1296856b76984152ecce94e873e4d6f6e33941.tar.gz nextcloud-server-fd1296856b76984152ecce94e873e4d6f6e33941.zip | |
Merge pull request #24185 from nextcloud/bugfix/noid/external-s3-delete-folder
| -rw-r--r-- | apps/files_external/lib/Lib/Storage/AmazonS3.php | 1 | ||||
| -rw-r--r-- | lib/private/Files/Storage/Common.php | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/apps/files_external/lib/Lib/Storage/AmazonS3.php b/apps/files_external/lib/Lib/Storage/AmazonS3.php index 32e74250a91..9f121cc880a 100644 --- a/apps/files_external/lib/Lib/Storage/AmazonS3.php +++ b/apps/files_external/lib/Lib/Storage/AmazonS3.php @@ -318,6 +318,7 @@ class AmazonS3 extends \OC\Files\Storage\Common { } // we reached the end when the list is no longer truncated } while ($objects['IsTruncated']); + $this->deleteObject($path); } catch (S3Exception $e) { \OC::$server->getLogger()->logException($e, ['app' => 'files_external']); return false; diff --git a/lib/private/Files/Storage/Common.php b/lib/private/Files/Storage/Common.php index 0814e296492..4c07426dd70 100644 --- a/lib/private/Files/Storage/Common.php +++ b/lib/private/Files/Storage/Common.php @@ -612,6 +612,7 @@ abstract class Common implements Storage, ILockingStorage, IWriteStreamStorage { $dh = $sourceStorage->opendir($sourceInternalPath); $result = $this->mkdir($targetInternalPath); if (is_resource($dh)) { + $result = true; while ($result and ($file = readdir($dh)) !== false) { if (!Filesystem::isIgnoredDir($file)) { $result &= $this->copyFromStorage($sourceStorage, $sourceInternalPath . '/' . $file, $targetInternalPath . '/' . $file); |