applying patch to version 1.15.0

1 files changed, 3 insertions, 1 deletions

diff --git a/includes/media/Bitmap.php b/includes/media/Bitmap.php
index b949ae3d..c2f2458e 100644
--- a/includes/media/Bitmap.php
+++ b/includes/media/Bitmap.php
@@ -42,7 +42,7 @@ class BitmapHandler extends ImageHandler {
 
 	function doTransform( $image, $dstPath, $dstUrl, $params, $flags = 0 ) {
 		global $wgUseImageMagick, $wgImageMagickConvertCommand, $wgImageMagickTempDir;
-		global $wgCustomConvertCommand;
+		global $wgCustomConvertCommand, $wgUseImageResize;
 		global $wgSharpenParameter, $wgSharpenReductionThreshold;
 		global $wgMaxAnimatedGifArea;
 
@@ -69,6 +69,8 @@ class BitmapHandler extends ImageHandler {
 		if ( !$dstPath ) {
 			// No output path available, client side scaling only
 			$scaler = 'client';
+		} elseif( !$wgUseImageResize ) {
+			$scaler = 'client';
 		} elseif ( $wgUseImageMagick ) {
 			$scaler = 'im';
 		} elseif ( $wgCustomConvertCommand ) {