From: Aaron Schulz <aschulz@wikimedia.org>
Date: Thu, 22 Dec 2016 03:10:04 +0000 (-0800)
Subject: Avoid pointless use of isset() in LBFactoryMulti()
X-Git-Tag: 1.31.0-rc.0~4475^2
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/comptes/ajouter.php?a=commitdiff_plain;h=51061d64cbd55df78f299e3ee108007577518f27;p=lhc%2Fweb%2Fwiklou.git

Avoid pointless use of isset() in LBFactoryMulti()

Change-Id: Ibaaa97a515f627860f6681f204aa1542b1639640
---

diff --git a/includes/libs/rdbms/lbfactory/LBFactoryMulti.php b/includes/libs/rdbms/lbfactory/LBFactoryMulti.php
index 1d22873640..4158e616bd 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;