Update auf 1.13.0

1 files changed, 22 insertions, 12 deletions

diff --git a/maintenance/eval.php b/maintenance/eval.php
index 519411df..a990a4d8 100644
--- a/maintenance/eval.php
+++ b/maintenance/eval.php
@@ -12,15 +12,11 @@
  * To get decent line editing behavior, you should compile PHP with support
  * for GNU readline (pass --with-readline to configure).
  *
- * @addtogroup Maintenance
+ * @file
+ * @ingroup Maintenance
  */
 
-$wgForceLoadBalancing = (getenv('MW_BALANCE') ? true : false);
-$wgUseNormalUser = (getenv('MW_WIKIUSER') ? true : false);
-if (getenv('MW_PROFILING')) {
-	define('MW_CMDLINE_CALLBACK', 'wfSetProfiling');
-}
-function wfSetProfiling() { $GLOBALS['wgProfiling'] = true; }
+$wgUseNormalUser = (bool)getenv('MW_WIKIUSER');
 
 $optionsWithArgs = array( 'd' );
 
@@ -33,8 +29,9 @@ if ( isset( $options['d'] ) ) {
 		$wgDebugLogFile = '/dev/stdout';
 	}
 	if ( $d > 1 ) {
-		foreach ( $wgLoadBalancer->mServers as $i => $server ) {
-			$wgLoadBalancer->mServers[$i]['flags'] |= DBO_DEBUG;
+		$lb = wfGetLB();
+		foreach ( $lb->mServers as $i => $server ) {
+			$lb->mServers[$i]['flags'] |= DBO_DEBUG;
 		}
 	}
 	if ( $d > 2 ) {
@@ -42,8 +39,24 @@ if ( isset( $options['d'] ) ) {
 	}
 }
 
+if ( function_exists( 'readline_add_history' ) 
+	&& function_exists( 'posix_isatty' ) && posix_isatty( 0 /*STDIN*/ ) ) 
+{
+	$useReadline = true;
+} else {
+	$useReadline = false;
+}
+
+if ( $useReadline ) {
+	$historyFile = "{$_ENV['HOME']}/.mweval_history";
+	readline_read_history( $historyFile );
+}
 
 while ( ( $line = readconsole( '> ' ) ) !== false ) {
+	if ( $useReadline ) {
+		readline_add_history( $line );
+		readline_write_history( $historyFile );
+	}
 	$val = eval( $line . ";" );
 	if( is_null( $val ) ) {
 		echo "\n";
@@ -52,9 +65,6 @@ while ( ( $line = readconsole( '> ' ) ) !== false ) {
 	} else {
 		var_dump( $val );
 	}
-	if ( function_exists( "readline_add_history" ) ) {
-		readline_add_history( $line );
-	}
 }
 
 print "\n";