From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Tue, 20 Dec 2011 20:15:05 +0000 (+0000)
Subject: FU r106770: fixed the other getTransform() call
X-Git-Tag: 1.31.0-rc.0~25860
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmes_infos.php?a=commitdiff_plain;h=9e61d94e0ea5122685ff6895f051954147d279b6;p=lhc%2Fweb%2Fwiklou.git

FU r106770: fixed the other getTransform() call
---

diff --git a/includes/filerepo/file/File.php b/includes/filerepo/file/File.php
index fb80861b97..7aef11b97a 100644
--- a/includes/filerepo/file/File.php
+++ b/includes/filerepo/file/File.php
@@ -769,7 +769,10 @@ abstract class File {
 		if ( $this->repo->fileExists( $thumbPath ) && !( $flags & self::RENDER_FORCE ) ) {
 			$timestamp = $this->repo->getFileTimestamp( $thumbPath );
 			if ( $timestamp !== false && $timestamp >= $wgThumbnailEpoch ) {
-				return $this->handler->getTransform( $this, false, $thumbUrl, $params );
+				// XXX: Pass in the storage path even though we are not rendering anything
+				// and the path is supposed to be an FS path. This is due to getScalerType()
+				// getting called on the path and clobbering $thumb->getUrl() if it's false.
+				return $this->handler->getTransform( $this, $thumbPath, $thumbUrl, $params );
 			}
 		} elseif ( $flags & self::RENDER_FORCE ) {
 			wfDebug( __METHOD__ . " forcing rendering per flag File::RENDER_FORCE\n" );