From: Andrew Garrett <werdna@users.mediawiki.org>
Date: Wed, 25 Mar 2009 13:59:06 +0000 (+0000)
Subject: Fix fatals in ApiQueryImageInfo.php where no metadata exists
X-Git-Tag: 1.31.0-rc.0~42364
X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=106e14ba7e486a2cd421478e1b9e8e310efedd40;p=lhc%2Fweb%2Fwiklou.git

Fix fatals in ApiQueryImageInfo.php where no metadata exists
---

diff --git a/includes/api/ApiQueryImageInfo.php b/includes/api/ApiQueryImageInfo.php
index 8de5e9defa..0a7e09b052 100644
--- a/includes/api/ApiQueryImageInfo.php
+++ b/includes/api/ApiQueryImageInfo.php
@@ -224,14 +224,16 @@ class ApiQueryImageInfo extends ApiQueryBase {
 	public static function processMetaData($metadata, $result)
 	{
 		$retval = array();
-		foreach($metadata as $key => $value)
-		{
-			$r = array('name' => $key);
-			if(is_array($value))
-				$r['value'] = self::processMetaData($value, $result);
-			else
-				$r['value'] = $value;
-			$retval[] = $r;
+		if ( is_array( $metadata ) ) {
+			foreach($metadata as $key => $value)
+			{
+				$r = array('name' => $key);
+				if(is_array($value))
+					$r['value'] = self::processMetaData($value, $result);
+				else
+					$r['value'] = $value;
+				$retval[] = $r;
+			}
 		}
 		$result->setIndexedTagName($retval, 'metadata');
 		return $retval;