From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Sat, 6 Nov 2010 22:34:57 +0000 (+0000)
Subject: Fix two errors from r76220:
X-Git-Tag: 1.31.0-rc.0~34033
X-Git-Url: http://git.cyclocoop.org///%22%40url%40//%22?a=commitdiff_plain;h=c23ce49760ca1b94085eb25a94bb8b415d62d413;p=lhc%2Fweb%2Fwiklou.git

Fix two errors from r76220:
* Fatal error: Call to undefined function readlineEmulation() in maintenance/Maintenance.php on line 1075
* sh: Array: command not found
---

diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index b459c3f474..10ae5ed82c 100644
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -1072,7 +1072,7 @@ abstract class Maintenance {
 			return readline( $prompt );
 		} else {
 			if ( $isatty ) {
-				$st = readlineEmulation( $prompt );
+				$st = self::readlineEmulation( $prompt );
 			} else {
 				if ( feof( STDIN ) ) {
 					$st = false;
@@ -1092,7 +1092,7 @@ abstract class Maintenance {
 	 * @return String
 	 */
 	private static function readlineEmulation( $prompt ) {
-		$bash = array( 'bash' );
+		$bash = 'bash';
 		if ( !wfIsWindows() && Installer::locateExecutableInDefaultPaths( $bash ) ) {
 			$retval = false;
 			$encPrompt = wfEscapeShellArg( $prompt );