Fix Bug #30322 “SVG metadata is read incorrectly” by applying supplied patch

[lhc/web/wiklou.git] / includes / media / ExifBitmap.php

diff --git a/includes/media/ExifBitmap.php b/includes/media/ExifBitmap.php
index b63ef18..e58ac5c 100644 (file)
--- 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