From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 7 Feb 2018 21:50:44 +0000 (+0000)
Subject: Merge "Fix for warning in ForeignAPIFile when no thumbnails"
X-Git-Tag: 1.31.0-rc.0~670
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=e7d4fbf3b36a6fc5679e52641a255a6e027e2488;hp=3f5626f3d26474fae61fd928785970e86fc6a099

Merge "Fix for warning in ForeignAPIFile when no thumbnails"
---

diff --git a/includes/filerepo/file/ForeignAPIFile.php b/includes/filerepo/file/ForeignAPIFile.php
index 8dcb289abd..2a40942527 100644
--- a/includes/filerepo/file/ForeignAPIFile.php
+++ b/includes/filerepo/file/ForeignAPIFile.php
@@ -340,8 +340,10 @@ class ForeignAPIFile extends File {
 		$iter = $this->repo->getBackend()->getFileList( [ 'dir' => $dir ] );
 
 		$files = [];
-		foreach ( $iter as $file ) {
-			$files[] = $file;
+		if ( $iter ) {
+			foreach ( $iter as $file ) {
+				$files[] = $file;
+			}
 		}
 
 		return $files;