From: Max Semenik <maxsem@users.mediawiki.org>
Date: Mon, 7 Mar 2011 18:45:43 +0000 (+0000)
Subject: Bug 27920 - Installer sets $wgUseImageMagick = true even when IM is not found
X-Git-Tag: 1.31.0-rc.0~31573
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/supprimer.php?a=commitdiff_plain;h=831d70e3322e7af2e9826fb7b0511567e12a5855;p=lhc%2Fweb%2Fwiklou.git

Bug 27920 - Installer sets $wgUseImageMagick = true even when IM is not found
---

diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 838026bcdf..fd43fef12b 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -816,6 +816,7 @@ abstract class Installer {
 		$names = array( wfIsWindows() ? 'convert.exe' : 'convert' );
 		$convert = self::locateExecutableInDefaultPaths( $names, array( '$1 -version', 'ImageMagick' ) );
 
+		$this->setVar( 'wgImageMagickConvertCommand', '' );
 		if ( $convert ) {
 			$this->setVar( 'wgImageMagickConvertCommand', $convert );
 			$this->showMessage( 'config-imagemagick', $convert );