http://www.mediawiki.org/wiki/Special:Code/MediaWiki/76223
Revision: 76223
Author: ialex
Date: 2010-11-06 22:46:37 +0000 (Sat, 06 Nov 2010)
Log Message:
-----------
Fix for r76221: Installer::locateExecutableInDefaultPaths() takes an array as
parameter; problem was line 1101
Modified Paths:
--------------
trunk/phase3/maintenance/Maintenance.php
Modified: trunk/phase3/maintenance/Maintenance.php
===================================================================
--- trunk/phase3/maintenance/Maintenance.php 2010-11-06 22:43:55 UTC (rev
76222)
+++ trunk/phase3/maintenance/Maintenance.php 2010-11-06 22:46:37 UTC (rev
76223)
@@ -1092,8 +1092,8 @@
* @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\"";
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
