X-Git-Url: http://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_vote_del%27%2C%20idvote=vote.voteid%29%20%7D%7D?a=blobdiff_plain;f=includes%2Flibs%2Frdbms%2Floadbalancer%2FLoadBalancer.php;h=066d4b4089bdfff520aeb92a9e0da271ff9f2bd9;hb=d66cbd4046759ede40710daa67bd2bcaa500b329;hp=ba0f75712873ec7c4ee59bf8913c3f44923f61a6;hpb=ebec47ca248fb741c36d74c4f6b5730c9cddef83;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancer.php b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
index ba0f757128..066d4b4089 100644
--- a/includes/libs/rdbms/loadbalancer/LoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
@@ -1302,7 +1302,7 @@ class LoadBalancer implements ILoadBalancer {
 
 		// Create a live connection object
 		try {
-			$db = Database::factory( $server['type'], $server );
+			$conn = Database::factory( $server['type'], $server );
 			// Log when many connection are made on requests
 			++$this->connectionCounter;
 			$currentConnCount = $this->getCurrentConnectionCount();
@@ -1315,28 +1315,28 @@ class LoadBalancer implements ILoadBalancer {
 		} catch ( DBConnectionError $e ) {
 			// FIXME: This is probably the ugliest thing I have ever done to
 			// PHP. I'm half-expecting it to segfault, just out of disgust. -- TS
-			$db = $e->db;
+			$conn = $e->db;
 		}
 
-		$db->setLBInfo( $server );
-		$db->setLazyMasterHandle(
-			$this->getLazyConnectionRef( self::DB_MASTER, [], $db->getDomainID() )
+		$conn->setLBInfo( $server );
+		$conn->setLazyMasterHandle(
+			$this->getLazyConnectionRef( self::DB_MASTER, [], $conn->getDomainID() )
 		);
-		$db->setTableAliases( $this->tableAliases );
-		$db->setIndexAliases( $this->indexAliases );
+		$conn->setTableAliases( $this->tableAliases );
+		$conn->setIndexAliases( $this->indexAliases );
 
 		if ( $server['serverIndex'] === $this->getWriterIndex() ) {
 			if ( $this->trxRoundId !== false ) {
-				$this->applyTransactionRoundFlags( $db );
+				$this->applyTransactionRoundFlags( $conn );
 			}
 			foreach ( $this->trxRecurringCallbacks as $name => $callback ) {
-				$db->setTransactionListener( $name, $callback );
+				$conn->setTransactionListener( $name, $callback );
 			}
 		}
 
 		$this->lazyLoadReplicationPositions(); // session consistency
 
-		return $db;
+		return $conn;
 	}
 
 	/**
@@ -2273,9 +2273,9 @@ class LoadBalancer implements ILoadBalancer {
 		) );
 
 		// Update the prefix for all local connections...
-		$this->forEachOpenConnection( function ( IDatabase $db ) use ( $prefix ) {
-			if ( !$db->getLBInfo( 'foreign' ) ) {
-				$db->tablePrefix( $prefix );
+		$this->forEachOpenConnection( function ( IDatabase $conn ) use ( $prefix ) {
+			if ( !$conn->getLBInfo( 'foreign' ) ) {
+				$conn->tablePrefix( $prefix );
 			}
 		} );
 	}