r83470 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r83469‎ | r83470 | r83471 >
Date:18:45, 7 March 2011
Author:maxsem
Status:ok (Comments)
Tags:
Comment:
Bug 27920 - Installer sets $wgUseImageMagick = true even when IM is not found
Modified paths:
  • /trunk/phase3/includes/installer/Installer.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/installer/Installer.php
——@@ -816,6 +816,7 @@
817817 $names = array( wfIsWindows() ? 'convert.exe' : 'convert' );
818818 $convert = self::locateExecutableInDefaultPaths( $names, array( '$1 -version', 'ImageMagick' ) );
819819
 820+ $this->setVar( 'wgImageMagickConvertCommand', '' );
820821 if ( $convert ) {
821822 $this->setVar( 'wgImageMagickConvertCommand', $convert );
822823 $this->showMessage( 'config-imagemagick', $convert );

Sign-offs

UserFlagDate
Jarry1250tested19:24, 7 March 2011

Comments

#Comment by Jarry1250 (talk | contribs)   19:08, 7 March 2011

When I svn up'd and ran setup again, it still generated a LocalSettings file with the bad entries :(.

Don't know if I was to blame though.

#Comment by MaxSem (talk | contribs)   19:11, 7 March 2011

Look closer. They should be commented out. If not, it's a bug indeed :)

#Comment by Jarry1250 (talk | contribs)   19:14, 7 March 2011

Nope, definitely not commented out :( Literally: $wgEnableUploads = true; $wgUseImageMagick = true; $wgImageMagickConvertCommand = "/usr/bin/convert";

I'd run my installation again if I knew what I might have accidentally set incorrectly.

#Comment by Jarry1250 (talk | contribs)   19:24, 7 March 2011

Ah, as MaxSem quite right pointed out on IRC, I had to officially restart the installation. Indeed, the lines are properly commented out now.

Status & tagging log