http://www.mediawiki.org/wiki/Special:Code/MediaWiki/76302
Revision: 76302
Author: demon
Date: 2010-11-08 14:16:22 +0000 (Mon, 08 Nov 2010)
Log Message:
-----------
(bug 13353) Diff3 version checks are too strict. Just check for the phrase "GNU
diffutils" which is what we really want.
Modified Paths:
--------------
trunk/phase3/RELEASE-NOTES
trunk/phase3/includes/installer/Installer.php
Modified: trunk/phase3/RELEASE-NOTES
===================================================================
--- trunk/phase3/RELEASE-NOTES 2010-11-08 13:59:10 UTC (rev 76301)
+++ trunk/phase3/RELEASE-NOTES 2010-11-08 14:16:22 UTC (rev 76302)
@@ -407,6 +407,7 @@
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.
Modified: trunk/phase3/includes/installer/Installer.php
===================================================================
--- trunk/phase3/includes/installer/Installer.php 2010-11-08 13:59:10 UTC
(rev 76301)
+++ trunk/phase3/includes/installer/Installer.php 2010-11-08 14:16:22 UTC
(rev 76302)
@@ -623,7 +623,7 @@
*/
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 @@
$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;
}
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
