dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fc4c383
)
Bug 27920 - Installer sets $wgUseImageMagick = true even when IM is not found
author
Max Semenik
<maxsem@users.mediawiki.org>
Mon, 7 Mar 2011 18:45:43 +0000
(18:45 +0000)
committer
Max Semenik
<maxsem@users.mediawiki.org>
Mon, 7 Mar 2011 18:45:43 +0000
(18:45 +0000)
includes/installer/Installer.php
patch
|
blob
|
history
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 );