From: Bryan Tong Minh <btongminh@users.mediawiki.org>
Date: Sat, 12 Mar 2011 22:51:45 +0000 (+0000)
Subject: Follow-up r83792: Remove left in debugging
X-Git-Tag: 1.31.0-rc.0~31489
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=18403736f2bf33cdf01681dca1fea0f2873fd8aa;p=lhc%2Fweb%2Fwiklou.git

Follow-up r83792: Remove left in debugging
---

diff --git a/includes/media/Bitmap.php b/includes/media/Bitmap.php
index 8e433318d8..f001333340 100644
--- a/includes/media/Bitmap.php
+++ b/includes/media/Bitmap.php
@@ -181,13 +181,13 @@ class BitmapHandler extends ImageHandler {
 			$scaler = 'client';
 		} elseif ( !$wgUseImageResize ) {
 			$scaler = 'client';
-		}/* elseif ( $wgUseImageMagick ) {
+		} elseif ( $wgUseImageMagick ) {
 			$scaler = 'im';
 		} elseif ( $wgCustomConvertCommand ) {
 			$scaler = 'custom';
 		} elseif ( function_exists( 'imagecreatetruecolor' ) ) {
 			$scaler = 'gd';
-		}*/ elseif ( class_exists( 'Imagick' ) ) {
+		} elseif ( class_exists( 'Imagick' ) ) {
 			$scaler = 'imext';
 		} else {
 			$scaler = 'client';