Add /usr/local/bin to the diff3 search paths in the installer

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 6066af3..2b3d260 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -382,6 +382,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 6139) Workaround for transclusion oddities in Vietnamese upload text
 * (bug 6136) Update to Catalan language (ca)
 * Update to Japanese localization (ja)
+* Add /usr/local/bin to the diff3 search paths in the installer
 
 == Compatibility ==
 

diff --git a/config/index.php b/config/index.php
index d00b3f5..05b3eeb 100644 (file)
--- a/config/index.php
+++ b/config/index.php
@@ -345,7 +345,7 @@ if (!$conf->turck && !$conf->eaccel && !$conf->apc) {
 }
 
 $conf->diff3 = false;
-$diff3locations = array("/usr/bin", "/opt/csw/bin", "/usr/gnu/bin", "/usr/sfw/bin") + explode($sep, getenv("PATH"));
+$diff3locations = array("/usr/bin", "/usr/local/bin", "/opt/csw/bin", "/usr/gnu/bin", "/usr/sfw/bin") + explode($sep, getenv("PATH"));
 $diff3names = array("gdiff3", "diff3", "diff3.exe");
 
 $diff3versioninfo = array('$1 --version 2>&1', 'diff3 (GNU diffutils)');