From f09e0ec8ca2cf39772f53bc5ac3ac7ced857b31b Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 3 Oct 2011 22:04:04 +0000 Subject: [PATCH] * (bug 31282) Fix use of ForeignAPIRepo/InstantCommons TIFF images when $wgTiffThumbnailType is left unset. When pulling files over ForeignAPIRepo, the source site is what creates the thumbnails; we don't care whether we can locally produce thumbs of TIFFs. This feels a bit hacky, and may indicate we need to better refactor media handlers & file repositories. As long as the source site can produce a thumbnail image URL or a chunk of HTML to export, the local site shouldn't have to touch any of that stuff and should just be passing data through. --- includes/media/Tiff.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/includes/media/Tiff.php b/includes/media/Tiff.php index 0a103895f5..0f317e1a8d 100644 --- a/includes/media/Tiff.php +++ b/includes/media/Tiff.php @@ -17,13 +17,18 @@ 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. * + * Files pulled from an another MediaWiki instance via ForeignAPIRepo / + * InstantCommons will have thumbnails managed from the remote instance, + * so we can skip this check. + * * @param $file * * @return bool */ function canRender( $file ) { global $wgTiffThumbnailType; - return (bool)$wgTiffThumbnailType; + return (bool)$wgTiffThumbnailType + || ($file->getRepo() instanceof ForeignAPIRepo); } /** -- 2.20.1