From fe7c284e7b1fff2d83ec42018931ef664fa96f0b Mon Sep 17 00:00:00 2001
From: Reedy <reedy@wikimedia.org>
Date: Mon, 4 Nov 2013 23:04:01 +0000
Subject: [PATCH] Invalid argument supplied for foreach() in FormatMetadata.php
 on line 1566

Bug: 56585
Change-Id: I5f65333cc94b66fd80fcf5abcfad7e10e4669310
---
 includes/media/FormatMetadata.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/includes/media/FormatMetadata.php b/includes/media/FormatMetadata.php
index b34ad650c0..91c4c9a063 100755
--- a/includes/media/FormatMetadata.php
+++ b/includes/media/FormatMetadata.php
@@ -1563,11 +1563,13 @@ class FormatMetadata extends ContextSource {
 
 		$common = $file->getCommonMetaArray();
 
-		foreach ( $common as $key => $value ) {
-			$fileMetadata[$key] = array(
-				'value' => $value,
-				'source' => 'file-metadata',
-			);
+		if ( $common !== false ) {
+			foreach ( $common as $key => $value ) {
+				$fileMetadata[$key] = array(
+					'value' => $value,
+					'source' => 'file-metadata',
+				);
+			}
 		}
 
 		wfProfileOut( __METHOD__ );
-- 
2.20.1