From: Brion Vibber <brion@users.mediawiki.org>
Date: Tue, 25 Nov 2008 18:26:21 +0000 (+0000)
Subject: * Follow-up to r43656 -- rename the use of a function when you rename it!
X-Git-Tag: 1.31.0-rc.0~44206
X-Git-Url: http://git.cyclocoop.org//%27%40script%40/%27?a=commitdiff_plain;h=e240272a80d384bd3d4785f53c92ddf5cac8b52b;p=lhc%2Fweb%2Fwiklou.git

* Follow-up to r43656 -- rename the use of a function when you rename it!
* Follow-up to r43655 -- $clientWidth/$clientHeight were used in error generation, no longer exist in the breakout function
---

diff --git a/includes/media/SVG.php b/includes/media/SVG.php
index 7077caa631..f0519e8973 100644
--- a/includes/media/SVG.php
+++ b/includes/media/SVG.php
@@ -60,7 +60,7 @@ class SvgHandler extends ImageHandler {
 				wfMsg( 'thumbnail_dest_directory' ) );
 		}
 		
-		$status = $this->transformSvgToPng( $srcPath, $dstPath, $physicalWidth, $physicalHeight );
+		$status = $this->rasterize( $srcPath, $dstPath, $physicalWidth, $physicalHeight );
 		if( $status === true ) {
 			return new ThumbnailImage( $image, $dstUrl, $clientWidth, $clientHeight, $dstPath );
 		} else {
@@ -99,7 +99,7 @@ class SvgHandler extends ImageHandler {
 		if ( $retval != 0 || $removed ) {
 			wfDebugLog( 'thumbnail', sprintf( 'thumbnail failed on %s: error %d "%s" from "%s"',
 					wfHostname(), $retval, trim($err), $cmd ) );
-			return new MediaTransformError( 'thumbnail_error', $clientWidth, $clientHeight, $err );
+			return new MediaTransformError( 'thumbnail_error', $width, $height, $err );
 		}
 		return true;
 	}