| Index: trunk/phase3/config/index.php |
| — | — | @@ -431,7 +431,14 @@ |
| 432 | 432 | } |
| 433 | 433 | |
| 434 | 434 | $conf->diff3 = false; |
| 435 | | -$diff3locations = array( "/usr/bin", "/usr/local/bin", "/opt/csw/bin", "/usr/gnu/bin", "/usr/sfw/bin" ) + explode( $sep, getenv( "PATH" ) ); |
| | 435 | +$diff3locations = array_merge( |
| | 436 | + array( |
| | 437 | + "/usr/bin", |
| | 438 | + "/usr/local/bin", |
| | 439 | + "/opt/csw/bin", |
| | 440 | + "/usr/gnu/bin", |
| | 441 | + "/usr/sfw/bin" ), |
| | 442 | + explode( $sep, getenv( "PATH" ) ) ); |
| 436 | 443 | $diff3names = array( "gdiff3", "diff3", "diff3.exe" ); |
| 437 | 444 | |
| 438 | 445 | $diff3versioninfo = array( '$1 --version 2>&1', 'diff3 (GNU diffutils)' ); |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -131,8 +131,8 @@ |
| 132 | 132 | * Sort the list of skins in "My Preferences" -> Skins by alphabetical order. |
| 133 | 133 | * (bug 7785) Postgres compatibility for timestamps in RC feeds |
| 134 | 134 | * (bug 7550) Normalize user parameter normally on Special:Log |
| | 135 | +* (bug 7294) Fix PATH search for diff3 on install |
| 135 | 136 | |
| 136 | | - |
| 137 | 137 | == Languages updated == |
| 138 | 138 | |
| 139 | 139 | * Bishnupriya Manipuri (bpy) |