X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Ffilerepo%2Ffile%2FFile.php;h=9aa2b186e524b2f5b8e2c56f7c03f0636d78bee4;hp=7116c22ce0659834ffa3ae907b1a7d2f40c61814;hb=6c9a2923fe1ee3a65cb027be5e781772f2b12fbd;hpb=99da289757bf70b4f117580c8361e1a335c74d30 diff --git a/includes/filerepo/file/File.php b/includes/filerepo/file/File.php index 7116c22ce0..9aa2b186e5 100644 --- 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 ); + if ( !is_array( $metadata ) ) { + $metadata = []; } + + return $handler->getContentHeaders( $metadata ); } return [];