Merge pull request #8842 from lanxenet/patch-1

fix(AmazonS3): fix loop $result['Contents'] error
nextcloud · May 7, 2018 · b348431 · b348431
2 parents 43c1e51 + 6212992
commit b348431
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/apps/files_external/lib/Lib/Storage/AmazonS3.php b/apps/files_external/lib/Lib/Storage/AmazonS3.php
@@ -291,15 +291,17 @@ public function opendir($path) {
 						$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;
 				}
 			}