]> source.dussan.org Git - nextcloud-server.git/commitdiff
Update lib/private/Files/ObjectStore/S3.php 37776/head
authorRsplwe <i@rsplwe.com>
Mon, 3 Apr 2023 13:59:59 +0000 (21:59 +0800)
committerbackportbot-nextcloud[bot] <backportbot-nextcloud[bot]@users.noreply.github.com>
Mon, 17 Apr 2023 22:23:20 +0000 (22:23 +0000)
Co-authored-by: Côme Chilliet <91878298+come-nc@users.noreply.github.com>
Signed-off-by: Rsplwe <i@rsplwe.com>
lib/private/Files/ObjectStore/S3.php

index e760b8b1572537a518984de4a42a95a74b096e73..76eee2bc96241245a82e6c0ae92f9497e12ab5bc 100644 (file)
@@ -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');
                }