Merge "ApiFeedWatchlist: Use guessSectionNameFromWikiText()"

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

diff --git a/includes/media/MediaHandler.php b/includes/media/MediaHandler.php
index 502fce3..8551a12 100644 (file)
--- a/includes/media/MediaHandler.php
+++ b/includes/media/MediaHandler.php
@@ -288,7 +288,7 @@ abstract class MediaHandler {
         * @return array Thumbnail extension and MIME type
         */
        function getThumbType( $ext, $mime, $params = null ) {
-               $magic = MimeMagic::singleton();
+               $magic = MediaWiki\MediaWikiServices::getInstance()->getMimeAnalyzer();
                if ( !$ext || $magic->isMatchingExtension( $ext, $mime ) === false ) {
                        // The extension is not valid for this MIME type and we do
                        // recognize the MIME type
@@ -304,8 +304,10 @@ abstract class MediaHandler {
        }
 
        /**
-       * @deprecated since 1.30, use MediaHandler::getContentHeaders instead
-       */
+        * @deprecated since 1.30, use MediaHandler::getContentHeaders instead
+        * @param array $metadata
+        * @return array
+        */
        public function getStreamHeaders( $metadata ) {
                wfDeprecated( __METHOD__, '1.30' );
                return $this->getContentHeaders( $metadata );
@@ -872,7 +874,7 @@ abstract class MediaHandler {
         * @param Array $pagesByDimensions
         * @return String
         * @since 1.30
-       */
+        */
        public static function getPageRangesByDimensions( $pagesByDimensions ) {
                $pageRangesByDimensions = [];
 
@@ -919,6 +921,6 @@ abstract class MediaHandler {
         * @since 1.30
         */
        public function getContentHeaders( $metadata ) {
-               return [];
+               return [ 'X-Content-Dimensions' => '' ]; // T175689
        }
 }