From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Mon, 13 Dec 2010 13:13:29 +0000 (+0000)
Subject: Followup r76220: locateExecutableInDefaultPaths() was made static, so use static... 
X-Git-Tag: 1.31.0-rc.0~33342
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=71db7810d30a3471c8871d55688c9bdb90d6f8da;p=lhc%2Fweb%2Fwiklou.git

Followup r76220: locateExecutableInDefaultPaths() was made static, so use static calls
---

diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 1338d0a03f..c1cc4f570a 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -570,7 +570,7 @@ abstract class Installer {
 		$names = array( "gdiff3", "diff3", "diff3.exe" );
 		$versionInfo = array( '$1 --version 2>&1', 'GNU diffutils' );
 
-		$diff3 = $this->locateExecutableInDefaultPaths( $names, $versionInfo );
+		$diff3 = self::locateExecutableInDefaultPaths( $names, $versionInfo );
 
 		if ( $diff3 ) {
 			$this->setVar( 'wgDiff3', $diff3 );
@@ -585,7 +585,7 @@ abstract class Installer {
 	 */
 	protected function envCheckGraphics() {
 		$names = array( wfIsWindows() ? 'convert.exe' : 'convert' );
-		$convert = $this->locateExecutableInDefaultPaths( $names, array( '$1 -version', 'ImageMagick' ) );
+		$convert = self::locateExecutableInDefaultPaths( $names, array( '$1 -version', 'ImageMagick' ) );
 
 		if ( $convert ) {
 			$this->setVar( 'wgImageMagickConvertCommand', $convert );