Process content headers when metadata is empty

The new width/height override means that files without
any metadata can get content headers.

Bug: T150741
Change-Id: I92199a4aa9e0408572ebf7d8e4c04cd0196f0d0a

diff --git a/includes/filerepo/file/File.php b/includes/filerepo/file/File.php
index 0ad0527..53211fe 100644 (file)
--- a/includes/filerepo/file/File.php
+++ b/includes/filerepo/file/File.php
@@ -2165,13 +2165,15 @@ abstract class File implements IDBAccessObject {
                if ( $handler ) {
                        $metadata = $this->getMetadata();
 
-                       if ( $metadata ) {
-                               if ( is_string( $metadata ) ) {
-                                       $metadata = MediaWiki\quietCall( 'unserialize', $metadata );
-                               }
+                       if ( is_string( $metadata ) ) {
+                               $metadata = MediaWiki\quietCall( 'unserialize', $metadata );
+                       }
 
-                               return $handler->getContentHeaders( $metadata, $this->getWidth(), $this->getHeight() );
+                       if ( !is_array( $metadata ) ) {
+                               $metadata = [];
                        }
+
+                       return $handler->getContentHeaders( $metadata, $this->getWidth(), $this->getHeight() );
                }
 
                return [];

diff --git a/includes/filerepo/file/LocalFile.php b/includes/filerepo/file/LocalFile.php
index 8514cc8..a90156f 100644 (file)
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -1202,6 +1202,10 @@ class LocalFile extends File {
                if ( $handler ) {
                        $metadata = MediaWiki\quietCall( 'unserialize', $props['metadata'] );
 
+                       if ( !is_array( $metadata ) ) {
+                               $metadata = [];
+                       }
+
                        $options['headers'] = $handler->getContentHeaders(
                                $metadata, $props['width'], $props['height']
                        );

diff --git a/includes/media/DjVu.php b/includes/media/DjVu.php
index dcd276c..f260850 100644 (file)
--- a/includes/media/DjVu.php
+++ b/includes/media/DjVu.php
@@ -471,7 +471,7 @@ class DjVuHandler extends ImageHandler {
        * @since 1.30
        */
        public function getContentHeaders( $metadata, $fallbackWidth = null, $fallbackHeight = null ) {
-               if ( !is_array( $metadata ) || !isset( $metadata['xml'] ) ) {
+               if ( !isset( $metadata['xml'] ) ) {
                        return [];
                }