From: Brian Wolff <bawolff@users.mediawiki.org>
Date: Wed, 29 Jun 2011 22:24:27 +0000 (+0000)
Subject: (follow-up r91106) Explicitly compare against the self::BROKEN_FILE constants.
X-Git-Tag: 1.31.0-rc.0~29181
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/ajouter.php?a=commitdiff_plain;h=c730dda86fa0ed9cea96061e7817a0bce24bc29b;p=lhc%2Fweb%2Fwiklou.git

(follow-up r91106) Explicitly compare against the self::BROKEN_FILE constants.

Before was doing if !$metadata, which used to work when self::BROKEN_FILE was 0, now it's -1
and that works less.
---

diff --git a/includes/media/ExifBitmap.php b/includes/media/ExifBitmap.php
index 42a2fd6887..2f981b3b7f 100644
--- a/includes/media/ExifBitmap.php
+++ b/includes/media/ExifBitmap.php
@@ -101,7 +101,8 @@ class ExifBitmapHandler extends BitmapHandler {
 	 */
 	function formatMetadata( $image ) {
 		$metadata = $image->getMetadata();
-		if ( !$metadata ||
+		if ( $metadata === self::OLD_BROKEN_FILE ||
+			$metadata === self::BROKEN_FILE ||
 			$this->isMetadataValid( $image, $metadata ) === self::METADATA_BAD )
 		{
 			// So we don't try and display metadata from PagedTiffHandler