parameters
* (bug 25175) HTML file cache now honor $wgCacheDirectory if
$wgFileCacheDirectory is not set
+* (bug 13353) Diff3 version checks were too strict, did not detect working diff3
=== API changes in 1.17 ===
* (bug 22738) Allow filtering by action type on query=logevent.
*/
public function envCheckDiff3() {
$names = array( "gdiff3", "diff3", "diff3.exe" );
- $versionInfo = array( '$1 --version 2>&1', 'diff3 (GNU diffutils)' );
+ $versionInfo = array( '$1 --version 2>&1', 'GNU diffutils' );
$diff3 = $this->locateExecutableInDefaultPaths( $names, $versionInfo );
$command = "\"$command\"";
}
$file = str_replace( '$1', $command, $versionInfo[0] );
- if ( strstr( wfShellExec( $file ), $versionInfo[1]) !== false ) {
+ if ( strstr( wfShellExec( $file ), $versionInfo[1] ) !== false ) {
return $command;
}
}