passing thumbnail params to getThumbType, as suggested by TimStarling in a comment...

diff --git a/includes/filerepo/File.php b/includes/filerepo/File.php
index ad69519..1469668 100644 (file)
--- 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 b866287..6f2230b 100644 (file)
--- 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 );
        }