From bb87a15438dd57ae9d8fe21de2110e30502e6969 Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Mon, 8 Nov 2010 14:16:22 +0000 Subject: [PATCH] (bug 13353) Diff3 version checks are too strict. Just check for the phrase "GNU diffutils" which is what we really want. --- RELEASE-NOTES | 1 + includes/installer/Installer.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index ed9d3cbebe..60b535451f 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -407,6 +407,7 @@ LocalSettings.php. The specific bugs are listed below in the general notes. 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. diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php index 1222802ed9..ed0728fc05 100644 --- a/includes/installer/Installer.php +++ b/includes/installer/Installer.php @@ -623,7 +623,7 @@ abstract class Installer { */ 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 ); @@ -916,7 +916,7 @@ abstract class Installer { $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; } } -- 2.20.1