From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Sat, 6 Nov 2010 22:46:37 +0000 (+0000)
Subject: Fix for r76221: Installer::locateExecutableInDefaultPaths() takes an array as paramet... 
X-Git-Tag: 1.31.0-rc.0~34031
X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=963d1d0609be5c77d229090a6fa341b30ba27142;p=lhc%2Fweb%2Fwiklou.git

Fix for r76221: Installer::locateExecutableInDefaultPaths() takes an array as parameter; problem was line 1101
---

diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index 10ae5ed82c..19c6a3cf41 100644
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -1092,8 +1092,8 @@ abstract class Maintenance {
 	 * @return String
 	 */
 	private static function readlineEmulation( $prompt ) {
-		$bash = 'bash';
-		if ( !wfIsWindows() && Installer::locateExecutableInDefaultPaths( $bash ) ) {
+		$bash = Installer::locateExecutableInDefaultPaths( array( 'bash' ) );
+		if ( !wfIsWindows() && $bash ) {
 			$retval = false;
 			$encPrompt = wfEscapeShellArg( $prompt );
 			$command = "read -er -p $encPrompt && echo \"\$REPLY\"";