From fa9f92d21a4d5514a9ebd1e200e72fd572288e64 Mon Sep 17 00:00:00 2001 From: Daniel Kinzler Date: Tue, 22 Jun 2010 16:01:54 +0000 Subject: [PATCH] passing thumbnail params to getThumbType, as suggested by TimStarling in a comment to bug 23258 --- includes/filerepo/File.php | 2 +- includes/media/Generic.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/filerepo/File.php b/includes/filerepo/File.php index ad69519f46..1469668e87 100644 --- a/includes/filerepo/File.php +++ b/includes/filerepo/File.php @@ -460,7 +460,7 @@ abstract class File { return null; } $extension = $this->getExtension(); - list( $thumbExt, $thumbMime ) = $this->handler->getThumbType( $extension, $this->getMimeType() ); + list( $thumbExt, $thumbMime ) = $this->handler->getThumbType( $extension, $this->getMimeType(), $params ); $thumbName = $this->handler->makeParamString( $params ) . '-' . $this->getName(); if ( $thumbExt != $extension ) { $thumbName .= ".$thumbExt"; diff --git a/includes/media/Generic.php b/includes/media/Generic.php index b866287f12..6f2230b38c 100644 --- a/includes/media/Generic.php +++ b/includes/media/Generic.php @@ -139,7 +139,7 @@ abstract class MediaHandler { * Get the thumbnail extension and MIME type for a given source MIME type * @return array thumbnail extension and MIME type */ - function getThumbType( $ext, $mime ) { + function getThumbType( $ext, $mime, $params = null ) { return array( $ext, $mime ); } -- 2.20.1