From: Mark A. Hershberger <mah@users.mediawiki.org>
Date: Tue, 27 Dec 2011 22:39:10 +0000 (+0000)
Subject: re Aaron's comment on r107351: remove double extension from temporary file
X-Git-Tag: 1.31.0-rc.0~25705
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=9bcfa3643926e398821538013a0813bb2839387f;p=lhc%2Fweb%2Fwiklou.git

re Aaron's comment on r107351: remove double extension from temporary file
---

diff --git a/includes/filerepo/file/File.php b/includes/filerepo/file/File.php
index 7cb9e27d9e..3ff17f7bf9 100644
--- a/includes/filerepo/file/File.php
+++ b/includes/filerepo/file/File.php
@@ -782,7 +782,7 @@ abstract class File {
 		$extension = $this->getExtension();
 		list( $thumbExt, $thumbMime ) = $this->handler->getThumbType(
 			$extension, $this->getMimeType(), $params );
-		$tmpFile = TempFSFile::factory( 'transform_', $this->getExtension() . '.' . $thumbExt );
+		$tmpFile = TempFSFile::factory( 'transform_', FileBackend::extensionFromPath( $thumbPath ) );
 		if ( !$tmpFile ) {
 			return new MediaTransformError( 'thumbnail_error',
 				$params['width'], 0, wfMsg( 'thumbnail-temp-create' ) );