http://www.mediawiki.org/wiki/Special:Code/MediaWiki/76221
Revision: 76221
Author: ialex
Date: 2010-11-06 22:34:57 +0000 (Sat, 06 Nov 2010)
Log Message:
-----------
Fix two errors from r76220:
* Fatal error: Call to undefined function readlineEmulation() in
maintenance/Maintenance.php on line 1075
* sh: Array: command not found
Modified Paths:
--------------
trunk/phase3/maintenance/Maintenance.php
Modified: trunk/phase3/maintenance/Maintenance.php
===================================================================
--- trunk/phase3/maintenance/Maintenance.php 2010-11-06 22:16:19 UTC (rev
76220)
+++ trunk/phase3/maintenance/Maintenance.php 2010-11-06 22:34:57 UTC (rev
76221)
@@ -1072,7 +1072,7 @@
return readline( $prompt );
} else {
if ( $isatty ) {
- $st = readlineEmulation( $prompt );
+ $st = self::readlineEmulation( $prompt );
} else {
if ( feof( STDIN ) ) {
$st = false;
@@ -1092,7 +1092,7 @@
* @return String
*/
private static function readlineEmulation( $prompt ) {
- $bash = array( 'bash' );
+ $bash = 'bash';
if ( !wfIsWindows() &&
Installer::locateExecutableInDefaultPaths( $bash ) ) {
$retval = false;
$encPrompt = wfEscapeShellArg( $prompt );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
