X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Ffilerepo%2Ffile%2FLocalFile.php;h=8d715e824a9e89cce09b319b4583a39e5377ff91;hb=a2254d32bf816c28f2a3fb4088b5e4356cff4c48;hp=c109fba9163d73f0ede689fb433ca54b083ce014;hpb=ea747bb2d4a4f1fadbd57256df6a20037dfc3966;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/filerepo/file/LocalFile.php b/includes/filerepo/file/LocalFile.php index c109fba916..8d715e824a 100644 --- a/includes/filerepo/file/LocalFile.php +++ b/includes/filerepo/file/LocalFile.php @@ -21,7 +21,8 @@ * @ingroup FileAbstraction */ -use \MediaWiki\Logger\LoggerFactory; +use MediaWiki\Logger\LoggerFactory; +use Wikimedia\Rdbms\Database; use Wikimedia\Rdbms\IDatabase; /** @@ -1199,7 +1200,13 @@ class LocalFile extends File { $options = []; $handler = MediaHandler::getHandler( $props['mime'] ); if ( $handler ) { - $options['headers'] = $handler->getStreamHeaders( $props['metadata'] ); + $metadata = MediaWiki\quietCall( 'unserialize', $props['metadata'] ); + + if ( !is_array( $metadata ) ) { + $metadata = []; + } + + $options['headers'] = $handler->getContentHeaders( $metadata ); } else { $options['headers'] = []; }