MediaWiki 1.15.0

[autoinstalls/mediawiki.git] / includes / media / Bitmap.php

diff --git a/includes/media/Bitmap.php b/includes/media/Bitmap.php
index b949ae3dca3938fafbda97d8fc1c3b93836be798..c2f2458e7530b3bb1d5dc2e410c0f8694f30111d 100644 (file)
--- 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 ) {