| Index: trunk/phase3/includes/installer/Installer.php |
| — | — | @@ -623,7 +623,7 @@ |
| 624 | 624 | */ |
| 625 | 625 | public function envCheckDiff3() { |
| 626 | 626 | $names = array( "gdiff3", "diff3", "diff3.exe" ); |
| 627 | | - $versionInfo = array( '$1 --version 2>&1', 'diff3 (GNU diffutils)' ); |
| | 627 | + $versionInfo = array( '$1 --version 2>&1', 'GNU diffutils' ); |
| 628 | 628 | |
| 629 | 629 | $diff3 = $this->locateExecutableInDefaultPaths( $names, $versionInfo ); |
| 630 | 630 | |
| — | — | @@ -916,7 +916,7 @@ |
| 917 | 917 | $command = "\"$command\""; |
| 918 | 918 | } |
| 919 | 919 | $file = str_replace( '$1', $command, $versionInfo[0] ); |
| 920 | | - if ( strstr( wfShellExec( $file ), $versionInfo[1]) !== false ) { |
| | 920 | + if ( strstr( wfShellExec( $file ), $versionInfo[1] ) !== false ) { |
| 921 | 921 | return $command; |
| 922 | 922 | } |
| 923 | 923 | } |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -407,6 +407,7 @@ |
| 408 | 408 | parameters |
| 409 | 409 | * (bug 25175) HTML file cache now honor $wgCacheDirectory if |
| 410 | 410 | $wgFileCacheDirectory is not set |
| | 411 | +* (bug 13353) Diff3 version checks were too strict, did not detect working diff3 |
| 411 | 412 | |
| 412 | 413 | === API changes in 1.17 === |
| 413 | 414 | * (bug 22738) Allow filtering by action type on query=logevent. |