| Index: trunk/phase3/includes/filerepo/file/File.php |
| — | — | @@ -769,7 +769,10 @@ |
| 770 | 770 | if ( $this->repo->fileExists( $thumbPath ) && !( $flags & self::RENDER_FORCE ) ) { |
| 771 | 771 | $timestamp = $this->repo->getFileTimestamp( $thumbPath ); |
| 772 | 772 | if ( $timestamp !== false && $timestamp >= $wgThumbnailEpoch ) { |
| 773 | | - return $this->handler->getTransform( $this, false, $thumbUrl, $params ); |
| | 773 | + // XXX: Pass in the storage path even though we are not rendering anything |
| | 774 | + // and the path is supposed to be an FS path. This is due to getScalerType() |
| | 775 | + // getting called on the path and clobbering $thumb->getUrl() if it's false. |
| | 776 | + return $this->handler->getTransform( $this, $thumbPath, $thumbUrl, $params ); |
| 774 | 777 | } |
| 775 | 778 | } elseif ( $flags & self::RENDER_FORCE ) { |
| 776 | 779 | wfDebug( __METHOD__ . " forcing rendering per flag File::RENDER_FORCE\n" ); |