From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 18 Feb 2015 01:28:20 +0000 (-0800)
Subject: Fixed backwards $group check in LoadBalancer
X-Git-Tag: 1.31.0-rc.0~12381
X-Git-Url: http://git.cyclocoop.org//%27%40script%40/%27?a=commitdiff_plain;h=c51517be480b3f44306bd4c9bd10d58ce5eb0e1e;p=lhc%2Fweb%2Fwiklou.git

Fixed backwards $group check in LoadBalancer

* Fixes 9190427

bug: T89507
Change-Id: I192ac3b00160c85e22e18d69cea5d9c46d2a301a
---

diff --git a/includes/db/LoadBalancer.php b/includes/db/LoadBalancer.php
index 4c9fd3240c..f357880471 100644
--- a/includes/db/LoadBalancer.php
+++ b/includes/db/LoadBalancer.php
@@ -328,7 +328,7 @@ class LoadBalancer {
 					$this->mServers[$i]['slave pos'] = $conn->getSlavePos();
 				}
 			}
-			if ( $this->mReadIndex <= 0 && $this->mLoads[$i] > 0 && $group !== false ) {
+			if ( $this->mReadIndex <= 0 && $this->mLoads[$i] > 0 && $group === false ) {
 				$this->mReadIndex = $i;
 			}
 		}
@@ -477,7 +477,7 @@ class LoadBalancer {
 				$groupIndex = $this->getReaderIndex( $group, $wiki );
 				if ( $groupIndex !== false ) {
 					$serverName = $this->getServerName( $groupIndex );
-					wfDebug( __METHOD__ . ": using server $serverName for group $group\n" );
+					wfDebug( __METHOD__ . ": using server $serverName for group '$group'\n" );
 					$i = $groupIndex;
 					break;
 				}