Fix fatals in ApiQueryImageInfo.php where no metadata exists
authorAndrew Garrett <werdna@users.mediawiki.org>
Wed, 25 Mar 2009 13:59:06 +0000 (13:59 +0000)
committerAndrew Garrett <werdna@users.mediawiki.org>
Wed, 25 Mar 2009 13:59:06 +0000 (13:59 +0000)
includes/api/ApiQueryImageInfo.php

index 8de5e9d..0a7e09b 100644 (file)
@@ -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;