From 51061d64cbd55df78f299e3ee108007577518f27 Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 21 Dec 2016 19:10:04 -0800
Subject: [PATCH] Avoid pointless use of isset() in LBFactoryMulti()

Change-Id: Ibaaa97a515f627860f6681f204aa1542b1639640
---
 includes/libs/rdbms/lbfactory/LBFactoryMulti.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/includes/libs/rdbms/lbfactory/LBFactoryMulti.php b/includes/libs/rdbms/lbfactory/LBFactoryMulti.php
index 1d228736406..4158e616bd9 100644
--- a/includes/libs/rdbms/lbfactory/LBFactoryMulti.php
+++ b/includes/libs/rdbms/lbfactory/LBFactoryMulti.php
@@ -260,7 +260,7 @@ class LBFactoryMulti extends LBFactory {
 			throw new InvalidArgumentException( __METHOD__ . ": Unknown cluster \"$cluster\"" );
 		}
 		$template = $this->serverTemplate;
-		if ( isset( $this->externalTemplateOverrides ) ) {
+		if ( $this->externalTemplateOverrides ) {
 			$template = $this->externalTemplateOverrides + $template;
 		}
 		if ( isset( $this->templateOverridesByCluster[$cluster] ) ) {
@@ -348,7 +348,7 @@ class LBFactoryMulti extends LBFactory {
 			$serverInfo = $template;
 			if ( $master ) {
 				$serverInfo['master'] = true;
-				if ( isset( $this->masterTemplateOverrides ) ) {
+				if ( $this->masterTemplateOverrides ) {
 					$serverInfo = $this->masterTemplateOverrides + $serverInfo;
 				}
 				$master = false;
-- 
2.11.4.GIT