From 5aab0ff71eee68c808aa2bcbdfaeb4cfba9730e2 Mon Sep 17 00:00:00 2001 From: btongminh Date: Sun, 23 Sep 2012 20:52:00 +0200 Subject: [PATCH] (bug 35693) ApiQueryImageInfo now suppresses errors when unserializing metadata Change-Id: I7c9649b54a9d1d8f8b79beff7435a32860b80a61 --- RELEASE-NOTES-1.20 | 1 + includes/api/ApiQueryImageInfo.php | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) 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; -- 2.20.1