From: Siebrand <siebrand@wikimedia.org>
Date: Sun, 23 Sep 2012 19:01:20 +0000 (+0000)
Subject: Merge "Follow-up Ifd700826 (60d119c), address a fixme in a re-enabled test."
X-Git-Tag: 1.31.0-rc.0~22303
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=408e6a7003928b86218610e41be95eead5d08598;hp=3beaa0a027612a62030b4d969a05b744c0388e2b;p=lhc%2Fweb%2Fwiklou.git

Merge "Follow-up Ifd700826 (60d119c), address a fixme in a re-enabled test."
---

diff --git a/RELEASE-NOTES-1.20 b/RELEASE-NOTES-1.20
index b28cc70c10..2cd0625093 100644
--- a/RELEASE-NOTES-1.20
+++ b/RELEASE-NOTES-1.20
@@ -284,6 +284,7 @@ upgrade PHP if you have not done so prior to upgrading MediaWiki.
 * (bug 11142) Improve file extension blacklist error reporting in API upload.
 * (bug 39665) Cache AllowedGenerator array so it doesn't autoload all query classes
   on every request.
+* (bug 35693) ApiQueryImageInfo now suppresses errors when unserializing metadata
 
 === Languages updated in 1.20 ===
 
diff --git a/includes/api/ApiQueryImageInfo.php b/includes/api/ApiQueryImageInfo.php
index d822eed555..ee55fb5476 100644
--- a/includes/api/ApiQueryImageInfo.php
+++ b/includes/api/ApiQueryImageInfo.php
@@ -377,8 +377,10 @@ class ApiQueryImageInfo extends ApiQueryBase {
 		}
 
 		if ( $meta ) {
+			wfSuppressWarnings();
 			$metadata = unserialize( $file->getMetadata() );
-			if ( $version !== 'latest' ) {
+			wfRestoreWarnings();
+			if ( $metadata && $version !== 'latest' ) {
 				$metadata = $file->convertMetadataVersion( $metadata, $version );
 			}
 			$vals['metadata'] = $metadata ? self::processMetaData( $metadata, $result ) : null;