Merge pull request #8842 from lanxenet/patch-1

fix(AmazonS3):  fix loop $result['Contents'] error

1 files changed, 10 insertions, 8 deletions

diff --git a/apps/files_external/lib/Lib/Storage/AmazonS3.php b/apps/files_external/lib/Lib/Storage/AmazonS3.php
index 483f1610bcb..097b196b2d4 100644
--- a/apps/files_external/lib/Lib/Storage/AmazonS3.php
+++ b/apps/files_external/lib/Lib/Storage/AmazonS3.php
@@ -291,15 +291,17 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 						$files[] = substr(trim($prefix['Prefix'], '/'), strlen($path));
 					}
 				}
-				foreach ($result['Contents'] as $object) {
-					if (isset($object['Key']) && $object['Key'] === $path) {
-						// it's the directory itself, skip
-						continue;
+				if (is_array($result['Contents'])) {
+					foreach ($result['Contents'] as $object) {
+						if (isset($object['Key']) && $object['Key'] === $path) {
+							// it's the directory itself, skip
+							continue;
+						}
+						$file = basename(
+							isset($object['Key']) ? $object['Key'] : $object['Prefix']
+						);
+						$files[] = $file;
 					}
-					$file = basename(
-						isset($object['Key']) ? $object['Key'] : $object['Prefix']
-					);
-					$files[] = $file;
 				}
 			}