summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRsplwe <i@rsplwe.com>2023-04-03 21:59:59 +0800
committerbackportbot-nextcloud[bot] <backportbot-nextcloud[bot]@users.noreply.github.com>2023-04-17 22:23:20 +0000
commitdbc7d3ae7c97d624e5ad3e1e58f59b911991c79b (patch)
tree4547475f6b806caf69774056ed6c9eb5400911ee /lib
parenta69ae912fa8ed6f0e8a1ec8d0995cc4fb99ec2e1 (diff)
downloadnextcloud-server-dbc7d3ae7c97d624e5ad3e1e58f59b911991c79b.tar.gz
nextcloud-server-dbc7d3ae7c97d624e5ad3e1e58f59b911991c79b.zip
Update lib/private/Files/ObjectStore/S3.php
Co-authored-by: Côme Chilliet <91878298+come-nc@users.noreply.github.com> Signed-off-by: Rsplwe <i@rsplwe.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/private/Files/ObjectStore/S3.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/Files/ObjectStore/S3.php b/lib/private/Files/ObjectStore/S3.php
index e760b8b1572..76eee2bc962 100644
--- a/lib/private/Files/ObjectStore/S3.php
+++ b/lib/private/Files/ObjectStore/S3.php
@@ -81,7 +81,7 @@ class S3 implements IObjectStore, IObjectStoreMultiPartUpload {
'MaxParts' => 1000,
'PartNumberMarker' => $partNumberMarker
]);
- $parts = array_merge($parts, $result->get('Parts'));
+ $parts = array_merge($parts, $result->get('Parts') ?? []);
$isTruncated = $result->get('IsTruncated');
$partNumberMarker = $result->get('NextPartNumberMarker');
}