Update to MediaWiki 1.21.1

1 files changed, 11 insertions, 11 deletions

diff --git a/includes/db/LBFactory.php b/includes/db/LBFactory.php
index e82c54ba..d469e867 100644
--- a/includes/db/LBFactory.php
+++ b/includes/db/LBFactory.php
@@ -86,7 +86,7 @@ abstract class LBFactory {
 	 * Create a new load balancer object. The resulting object will be untracked,
 	 * not chronology-protected, and the caller is responsible for cleaning it up.
 	 *
-	 * @param $wiki String: wiki ID, or false for the current wiki
+	 * @param string $wiki wiki ID, or false for the current wiki
 	 * @return LoadBalancer
 	 */
 	abstract function newMainLB( $wiki = false );
@@ -94,7 +94,7 @@ abstract class LBFactory {
 	/**
 	 * Get a cached (tracked) load balancer object.
 	 *
-	 * @param $wiki String: wiki ID, or false for the current wiki
+	 * @param string $wiki wiki ID, or false for the current wiki
 	 * @return LoadBalancer
 	 */
 	abstract function getMainLB( $wiki = false );
@@ -104,8 +104,8 @@ abstract class LBFactory {
 	 * untracked, not chronology-protected, and the caller is responsible for
 	 * cleaning it up.
 	 *
-	 * @param $cluster String: external storage cluster, or false for core
-	 * @param $wiki String: wiki ID, or false for the current wiki
+	 * @param string $cluster external storage cluster, or false for core
+	 * @param string $wiki wiki ID, or false for the current wiki
 	 *
 	 * @return LoadBalancer
 	 */
@@ -114,8 +114,8 @@ abstract class LBFactory {
 	/**
 	 * Get a cached (tracked) load balancer for external storage
 	 *
-	 * @param $cluster String: external storage cluster, or false for core
-	 * @param $wiki String: wiki ID, or false for the current wiki
+	 * @param string $cluster external storage cluster, or false for core
+	 * @param string $wiki wiki ID, or false for the current wiki
 	 *
 	 * @return LoadBalancer
 	 */
@@ -240,7 +240,7 @@ class LBFactory_Simple extends LBFactory {
 	function newExternalLB( $cluster, $wiki = false ) {
 		global $wgExternalServers;
 		if ( !isset( $wgExternalServers[$cluster] ) ) {
-			throw new MWException( __METHOD__.": Unknown cluster \"$cluster\"" );
+			throw new MWException( __METHOD__ . ": Unknown cluster \"$cluster\"" );
 		}
 		return new LoadBalancer( array(
 			'servers' => $wgExternalServers[$cluster]
@@ -345,7 +345,7 @@ class ChronologyProtector {
 		if ( $lb->getServerCount() > 1 && !empty( $this->startupPos[$masterName] ) ) {
 			$info = $lb->parentInfo();
 			$pos = $this->startupPos[$masterName];
-			wfDebug( __METHOD__.": LB " . $info['id'] . " waiting for master pos $pos\n" );
+			wfDebug( __METHOD__ . ": LB " . $info['id'] . " waiting for master pos $pos\n" );
 			$lb->waitFor( $this->startupPos[$masterName] );
 		}
 	}
@@ -370,11 +370,11 @@ class ChronologyProtector {
 		$db = $lb->getAnyOpenConnection( 0 );
 		$info = $lb->parentInfo();
 		if ( !$db || !$db->doneWrites() ) {
-			wfDebug( __METHOD__.": LB {$info['id']}, no writes done\n" );
+			wfDebug( __METHOD__ . ": LB {$info['id']}, no writes done\n" );
 			return;
 		}
 		$pos = $db->getMasterPos();
-		wfDebug( __METHOD__.": LB {$info['id']} has master pos $pos\n" );
+		wfDebug( __METHOD__ . ": LB {$info['id']} has master pos $pos\n" );
 		$this->shutdownPos[$masterName] = $pos;
 	}
 
@@ -384,7 +384,7 @@ class ChronologyProtector {
 	 */
 	function shutdown() {
 		if ( session_id() != '' && count( $this->shutdownPos ) ) {
-			wfDebug( __METHOD__.": saving master pos for " .
+			wfDebug( __METHOD__ . ": saving master pos for " .
 				count( $this->shutdownPos ) . " master(s)\n" );
 			$_SESSION[__CLASS__] = $this->shutdownPos;
 		}