| Index: trunk/phase3/includes/installer/Installer.php |
| — | — | @@ -570,7 +570,7 @@ |
| 571 | 571 | $names = array( "gdiff3", "diff3", "diff3.exe" ); |
| 572 | 572 | $versionInfo = array( '$1 --version 2>&1', 'GNU diffutils' ); |
| 573 | 573 | |
| 574 | | - $diff3 = $this->locateExecutableInDefaultPaths( $names, $versionInfo ); |
| | 574 | + $diff3 = self::locateExecutableInDefaultPaths( $names, $versionInfo ); |
| 575 | 575 | |
| 576 | 576 | if ( $diff3 ) { |
| 577 | 577 | $this->setVar( 'wgDiff3', $diff3 ); |
| — | — | @@ -585,7 +585,7 @@ |
| 586 | 586 | */ |
| 587 | 587 | protected function envCheckGraphics() { |
| 588 | 588 | $names = array( wfIsWindows() ? 'convert.exe' : 'convert' ); |
| 589 | | - $convert = $this->locateExecutableInDefaultPaths( $names, array( '$1 -version', 'ImageMagick' ) ); |
| | 589 | + $convert = self::locateExecutableInDefaultPaths( $names, array( '$1 -version', 'ImageMagick' ) ); |
| 590 | 590 | |
| 591 | 591 | if ( $convert ) { |
| 592 | 592 | $this->setVar( 'wgImageMagickConvertCommand', $convert ); |