Merge "Revert "Log the reason why revision->getContent() returns null""

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

diff --git a/includes/media/ExifBitmap.php b/includes/media/ExifBitmap.php
index 2fe4872..4267210 100644 (file)
--- a/includes/media/ExifBitmap.php
+++ b/includes/media/ExifBitmap.php
@@ -99,9 +99,9 @@ class ExifBitmapHandler extends BitmapHandler {
                if ( $metadata === self::BROKEN_FILE ) {
                        return self::METADATA_GOOD;
                }
-               MediaWiki\suppressWarnings();
+               Wikimedia\suppressWarnings();
                $exif = unserialize( $metadata );
-               MediaWiki\restoreWarnings();
+               Wikimedia\restoreWarnings();
                if ( !isset( $exif['MEDIAWIKI_EXIF_VERSION'] )
                        || $exif['MEDIAWIKI_EXIF_VERSION'] != Exif::version()
                ) {
@@ -223,9 +223,9 @@ class ExifBitmapHandler extends BitmapHandler {
                if ( !$data ) {
                        return 0;
                }
-               MediaWiki\suppressWarnings();
+               Wikimedia\suppressWarnings();
                $data = unserialize( $data );
-               MediaWiki\restoreWarnings();
+               Wikimedia\restoreWarnings();
                if ( isset( $data['Orientation'] ) ) {
                        # See http://sylvana.net/jpegcrop/exif_orientation.html
                        switch ( $data['Orientation'] ) {
@@ -242,21 +242,4 @@ class ExifBitmapHandler extends BitmapHandler {
 
                return 0;
        }
-
-       /**
-       * Get useful response headers for GET/HEAD requests for a file with the given metadata
-       * @param $metadata Array Contains this handler's unserialized getMetadata() for a file
-       * @return Array
-       */
-       public function getContentHeaders( $metadata ) {
-               if ( !isset( $metadata['Width'] ) || !isset( $metadata['Height'] ) ) {
-                       return [];
-               }
-
-               $dimensionsMetadata = [];
-               $dimensionsMetadata['width'] = $metadata['Width'];
-               $dimensionsMetadata['height'] = $metadata['Height'];
-
-               return parent::getContentHeaders( $dimensionsMetadata );
-       }
 }