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 838026b..fd43fef 100644 (file)
--- 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 );