X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=maintenance%2Fsql.php;h=afa3ef725c79a8bc762de4dadfd00a03d24c9ff7;hb=dc66cfb452dd56afdca9a230c37a36b7105b1db7;hp=d43c8dc0406f77b9046aa2e101212df70a101788;hpb=4114333da508a12e3d806345475534fb10aa871c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/sql.php b/maintenance/sql.php
index d43c8dc040..afa3ef725c 100644
--- a/maintenance/sql.php
+++ b/maintenance/sql.php
@@ -53,7 +53,8 @@ class MwSql extends Maintenance {
 				$index = DB_SLAVE;
 			} else {
 				$index = null;
-				for ( $i = 0; $i < $lb->getServerCount(); ++$i ) {
+				$serverCount = $lb->getServerCount();
+				for ( $i = 0; $i < $serverCount; ++$i ) {
 					if ( $lb->getServerName( $i ) === $server ) {
 						$index = $i;
 						break;
@@ -87,12 +88,12 @@ class MwSql extends Maintenance {
 		}
 
 		$useReadline = function_exists( 'readline_add_history' )
-				&& Maintenance::posix_isatty( 0 /*STDIN*/ );
+			&& Maintenance::posix_isatty( 0 /*STDIN*/ );
 
 		if ( $useReadline ) {
 			global $IP;
 			$historyFile = isset( $_ENV['HOME'] ) ?
-					"{$_ENV['HOME']}/.mwsql_history" : "$IP/maintenance/.mwsql_history";
+				"{$_ENV['HOME']}/.mwsql_history" : "$IP/maintenance/.mwsql_history";
 			readline_read_history( $historyFile );
 		}
 
@@ -125,7 +126,7 @@ class MwSql extends Maintenance {
 				$prompt = $newPrompt;
 				$wholeLine = '';
 			} catch ( DBQueryError $e ) {
-				$doDie = ! Maintenance::posix_isatty( 0 );
+				$doDie = !Maintenance::posix_isatty( 0 );
 				$this->error( $e, $doDie );
 			}
 		}
@@ -135,7 +136,7 @@ class MwSql extends Maintenance {
 	/**
 	 * Print the results, callback for $db->sourceStream()
 	 * @param ResultWrapper $res The results object
-	 * @param DatabaseBase $db object
+	 * @param DatabaseBase $db
 	 */
 	public function sqlPrintResult( $res, $db ) {
 		if ( !$res ) {