(follow-up r91106) Explicitly compare against the self::BROKEN_FILE constants.
authorBrian Wolff <bawolff@users.mediawiki.org>
Wed, 29 Jun 2011 22:24:27 +0000 (22:24 +0000)
committerBrian Wolff <bawolff@users.mediawiki.org>
Wed, 29 Jun 2011 22:24:27 +0000 (22:24 +0000)
Before was doing if !$metadata, which used to work when self::BROKEN_FILE was 0, now it's -1
and that works less.

includes/media/ExifBitmap.php

index 42a2fd6..2f981b3 100644 (file)
@@ -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