From: Daniel Kinzler <daniel@users.mediawiki.org>
Date: Tue, 22 Jun 2010 16:01:54 +0000 (+0000)
Subject: passing thumbnail params to getThumbType, as suggested by TimStarling in a comment... 
X-Git-Tag: 1.31.0-rc.0~36416
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=fa9f92d21a4d5514a9ebd1e200e72fd572288e64;p=lhc%2Fweb%2Fwiklou.git

passing thumbnail params to getThumbType, as suggested by TimStarling in a comment to bug 23258
---

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 );
 	}