From 90107635d30c3b200797c3d10b1ccc377d5022b9 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Fri, 3 Nov 2006 13:01:22 +0000
Subject: [PATCH] * (bug 7294) Fix PATH search for diff3 on install

---
 RELEASE-NOTES    | 2 +-
 config/index.php | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 4f7e15b9f3..48ea4a8c24 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -131,7 +131,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Sort the list of skins in "My Preferences" -> Skins by alphabetical order.
 * (bug 7785) Postgres compatibility for timestamps in RC feeds
 * (bug 7550) Normalize user parameter normally on Special:Log
-
+* (bug 7294) Fix PATH search for diff3 on install
 
 == Languages updated ==
 
diff --git a/config/index.php b/config/index.php
index 01fdba0b31..f462524b01 100644
--- a/config/index.php
+++ b/config/index.php
@@ -431,7 +431,14 @@ if( !$conf->turck && !$conf->eaccel && !$conf->apc ) {
 }
 
 $conf->diff3 = false;
-$diff3locations = array( "/usr/bin", "/usr/local/bin", "/opt/csw/bin", "/usr/gnu/bin", "/usr/sfw/bin" ) + explode( $sep, getenv( "PATH" ) );
+$diff3locations = array_merge(
+	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)' );
-- 
2.20.1