From 4ffe712c84790513e1afc30b8df67a0ca35b3c99 Mon Sep 17 00:00:00 2001
From: Sam Reed <reedy@users.mediawiki.org>
Date: Fri, 17 Jun 2011 15:59:55 +0000
Subject: [PATCH] Fix trailing whitespace

---
 includes/db/Database.php     | 11 +++++------
 includes/db/LoadBalancer.php | 16 ++++++++--------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/includes/db/Database.php b/includes/db/Database.php
index 89b6dca3a0..45edb3919a 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -800,7 +800,6 @@ abstract class DatabaseBase implements DatabaseType {
 		}
 	}
 
-
 	/**
 	 * Intended to be compatible with the PEAR::DB wrapper functions.
 	 * http://pear.php.net/manual/en/package.database.db.intro-execute.php
@@ -1461,7 +1460,7 @@ abstract class DatabaseBase implements DatabaseType {
 			}
 
 			// Support 'NOT IN' by suffixing fieldname with an exclamation mark
-			$not = false; 
+			$not = false;
 			if( substr($field,-1) == '!' ) {
 				$not = true;
 				$field = substr($field, 0, -1 );
@@ -1604,7 +1603,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 * when calling query() directly.
 	 *
 	 * @param $name String: database table name
-	 * @param $quoted Boolean: Automatically pass the table name through 
+	 * @param $quoted Boolean: Automatically pass the table name through
 	 *          addIdentifierQuotes() so that it can be used in a query.
 	 * @return String: full database name
 	 */
@@ -1657,7 +1656,7 @@ abstract class DatabaseBase implements DatabaseType {
 			$database = ( !$quoted || $this->isQuotedIdentifier( $database ) ? $database : $this->addIdentifierQuotes( $database ) );
 			$prefix = '';
 		}
-		
+
 		$table = "{$prefix}{$table}";
 		if ( $quoted && !$this->isQuotedIdentifier( $table ) ) {
 			$table = $this->addIdentifierQuotes( "{$table}" );
@@ -1849,7 +1848,7 @@ abstract class DatabaseBase implements DatabaseType {
 	}
 
 	/**
-	 * Returns if the given identifier looks quoted or not according to 
+	 * Returns if the given identifier looks quoted or not according to
 	 * the database convention for quoting identifiers .
 	 *
 	 * @param $name string
@@ -2428,7 +2427,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 * Note that unlike most database abstraction functions, this function does not
 	 * automatically append database prefix, because it works at a lower
 	 * abstraction level.
-	 * The table names passed to this function shall not be quoted (this 
+	 * The table names passed to this function shall not be quoted (this
 	 * function calls addIdentifierQuotes when needed).
 	 *
 	 * @param $oldName String: name of table whose structure should be copied
diff --git a/includes/db/LoadBalancer.php b/includes/db/LoadBalancer.php
index 2283a1e27c..4ab044e6ea 100644
--- a/includes/db/LoadBalancer.php
+++ b/includes/db/LoadBalancer.php
@@ -50,7 +50,7 @@ class LoadBalancer {
 		$this->mLaggedSlaveMode = false;
 		$this->mErrorConnection = false;
 		$this->mAllowLagged = false;
-		$this->mLoadMonitorClass = isset( $params['loadMonitor'] ) 
+		$this->mLoadMonitorClass = isset( $params['loadMonitor'] )
 			? $params['loadMonitor'] : 'LoadMonitor_MySQL';
 
 		foreach( $params['servers'] as $i => $server ) {
@@ -240,7 +240,7 @@ class LoadBalancer {
 
 				if ( $i === false ) {
 					# pickRandom() returned false
-					# This is permanent and means the configuration or the load monitor 
+					# This is permanent and means the configuration or the load monitor
 					# wants us to return false.
 					wfDebugLog( 'connect', __METHOD__.": pickRandom() returned false\n" );
 					wfProfileOut( __METHOD__ );
@@ -258,7 +258,7 @@ class LoadBalancer {
 				}
 
 				// Perform post-connection backoff
-				$threshold = isset( $this->mServers[$i]['max threads'] ) 
+				$threshold = isset( $this->mServers[$i]['max threads'] )
 					? $this->mServers[$i]['max threads'] : false;
 				$backoff = $this->getLoadMonitor()->postConnectionBackoff( $conn, $threshold );
 
@@ -267,7 +267,7 @@ class LoadBalancer {
 				if ( $wiki !== false ) {
 					$this->reuseConnection( $conn );
 				}
-				
+
 				if ( $backoff ) {
 					# Post-connection overload, don't use this server for now
 					$totalThreadsConnected += $backoff;
@@ -350,7 +350,7 @@ class LoadBalancer {
 		}
 		wfProfileOut( __METHOD__ );
 	}
-	
+
 	/**
 	 * Set the master wait position and wait for ALL slaves to catch up to it
 	 */
@@ -413,11 +413,11 @@ class LoadBalancer {
 	/**
 	 * Get a connection by index
 	 * This is the main entry point for this class.
-	 * 
+	 *
 	 * @param $i Integer: server index
 	 * @param $groups Array: query groups
 	 * @param $wiki String: wiki ID
-	 * 
+	 *
 	 * @return DatabaseBase
 	 */
 	public function &getConnection( $i, $groups = array(), $wiki = false ) {
@@ -954,7 +954,7 @@ class LoadBalancer {
 	 * Results are cached for a short time in memcached, and indefinitely in the process cache
 	 *
 	 * @param $wiki
-	 * 
+	 *
 	 * @return array
 	 */
 	function getLagTimes( $wiki = false ) {
-- 
2.20.1