1 files changed, 69 insertions, 19 deletions

diff --git a/includes/media/PNG.php b/includes/media/PNG.php
index 5197282c..8fe9ecb4 100644
--- a/includes/media/PNG.php
+++ b/includes/media/PNG.php
@@ -12,26 +12,51 @@
  * @ingroup Media
  */
 class PNGHandler extends BitmapHandler {
-	
+
+	const BROKEN_FILE = '0';
+
+	/**
+	 * @param File $image
+	 * @param string $filename
+	 * @return string
+	 */
 	function getMetadata( $image, $filename ) {
-		if ( !isset($image->parsedPNGMetadata) ) {
-			try {
-				$image->parsedPNGMetadata = PNGMetadataExtractor::getMetadata( $filename );
-			} catch( Exception $e ) {
-				// Broken file?
-				wfDebug( __METHOD__ . ': ' . $e->getMessage() . "\n" );
-				return '0';
-			}
+		try {
+			$metadata = BitmapMetadataHandler::PNG( $filename );
+		} catch( Exception $e ) {
+			// Broken file?
+			wfDebug( __METHOD__ . ': ' . $e->getMessage() . "\n" );
+			return self::BROKEN_FILE;
 		}
 
-		return serialize($image->parsedPNGMetadata);
-
+		return serialize($metadata);
 	}
-	
+
+	/**
+	 * @param $image File
+	 * @return array|bool
+	 */
 	function formatMetadata( $image ) {
-		return false;
+		$meta = $image->getMetadata();
+
+		if ( !$meta ) {
+			return false;
+		}
+		$meta = unserialize( $meta );
+		if ( !isset( $meta['metadata'] ) || count( $meta['metadata'] ) <= 1 ) {
+			return false;
+		}
+
+		if ( isset( $meta['metadata']['_MW_PNG_VERSION'] ) ) {
+			unset( $meta['metadata']['_MW_PNG_VERSION'] );
+		}
+		return $this->formatMetadataHelper( $meta['metadata'] );
 	}
-	
+
+	/**
+	 * @param $image File
+	 * @return bool
+	 */
 	function isAnimatedImage( $image ) {
 		$ser = $image->getMetadata();
 		if ($ser) {
@@ -46,11 +71,33 @@ class PNGHandler extends BitmapHandler {
 	}
 	
 	function isMetadataValid( $image, $metadata ) {
+
+		if ( $metadata === self::BROKEN_FILE ) {
+			// Do not repetitivly regenerate metadata on broken file.
+			return self::METADATA_GOOD;
+		}
+
 		wfSuppressWarnings();
 		$data = unserialize( $metadata );
 		wfRestoreWarnings();
-		return (boolean) $data;
+
+		if ( !$data || !is_array( $data ) ) {
+			wfDebug(__METHOD__ . ' invalid png metadata' );
+			return self::METADATA_BAD;
+		}
+
+		if ( !isset( $data['metadata']['_MW_PNG_VERSION'] )
+			|| $data['metadata']['_MW_PNG_VERSION'] != PNGMetadataExtractor::VERSION ) {
+			wfDebug(__METHOD__ . ' old but compatible png metadata' );
+			return self::METADATA_COMPATIBLE;
+		}
+		return self::METADATA_GOOD;
 	}
+
+	/**
+	 * @param $image File
+	 * @return string
+	 */
 	function getLongDesc( $image ) {
 		global $wgLang;
 		$original = parent::getLongDesc( $image );
@@ -65,16 +112,19 @@ class PNGHandler extends BitmapHandler {
 		$info = array();
 		$info[] = $original;
 		
-		if ($metadata['loopCount'] == 0)
+		if ( $metadata['loopCount'] == 0 ) {
 			$info[] = wfMsgExt( 'file-info-png-looped', 'parseinline' );
-		elseif ($metadata['loopCount'] > 1)
+		} elseif ( $metadata['loopCount'] > 1 ) {
 			$info[] = wfMsgExt( 'file-info-png-repeat', 'parseinline', $metadata['loopCount'] );
+		}
 		
-		if ($metadata['frameCount'] > 0)
+		if ( $metadata['frameCount'] > 0 ) {
 			$info[] = wfMsgExt( 'file-info-png-frames', 'parseinline', $metadata['frameCount'] );
+		}
 		
-		if ($metadata['duration'])
+		if ( $metadata['duration'] ) {
 			$info[] = $wgLang->formatTimePeriod( $metadata['duration'] );
+		}
 		
 		return $wgLang->commaList( $info );
 	}