X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fmedia%2FTiff.php;h=6964170198b6f6c10f17b213941857040438961c;hb=5086bae49ce3615885099e4a2922536406f52a69;hp=55acb120e6ba8607402317a04caa966cf5cf0e54;hpb=10db87c8b5475c3be3098eec3f62de7e44f516fc;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/media/Tiff.php b/includes/media/Tiff.php index 55acb120e6..6964170198 100644 --- a/includes/media/Tiff.php +++ b/includes/media/Tiff.php @@ -27,7 +27,6 @@ * @ingroup Media */ class TiffHandler extends ExifBitmapHandler { - /** * Conversion to PNG for inline display can be disabled here... * Note scaling should work with ImageMagick, but may not with GD scaling. @@ -36,12 +35,12 @@ class TiffHandler extends ExifBitmapHandler { * InstantCommons will have thumbnails managed from the remote instance, * so we can skip this check. * - * @param $file - * + * @param File $file * @return bool */ function canRender( $file ) { global $wgTiffThumbnailType; + return (bool)$wgTiffThumbnailType || $file->getRepo() instanceof ForeignAPIRepo; } @@ -50,8 +49,7 @@ class TiffHandler extends ExifBitmapHandler { * Browsers don't support TIFF inline generally... * For inline display, we need to convert to PNG. * - * @param $file - * + * @param File $file * @return bool */ function mustRender( $file ) { @@ -59,13 +57,14 @@ class TiffHandler extends ExifBitmapHandler { } /** - * @param $ext - * @param $mime - * @param $params + * @param string $ext + * @param string $mime + * @param array $params * @return bool */ function getThumbType( $ext, $mime, $params = null ) { global $wgTiffThumbnailType; + return $wgTiffThumbnailType; } @@ -85,12 +84,13 @@ class TiffHandler extends ExifBitmapHandler { throw new MWException( 'Metadata array is not an array' ); } $meta['MEDIAWIKI_EXIF_VERSION'] = Exif::version(); + return serialize( $meta ); - } - catch ( MWException $e ) { + } catch ( MWException $e ) { // BitmapMetadataHandler throws an exception in certain exceptional // cases like if file does not exist. wfDebug( __METHOD__ . ': ' . $e->getMessage() . "\n" ); + return ExifBitmapHandler::BROKEN_FILE; } } else {