X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Flibs%2Frdbms%2Flbfactory%2FLBFactoryMulti.php;h=447b96f951bc8724ae46b7a6558f467aa908e2d2;hp=1d22873640671a537129c34d4f2f5f509d358536;hb=c584722cc2e3d33edae58d46c2149063b3fc6d72;hpb=fba48c6dae69b7163580d936095b7dd16c9b3644

diff --git a/includes/libs/rdbms/lbfactory/LBFactoryMulti.php b/includes/libs/rdbms/lbfactory/LBFactoryMulti.php
index 1d22873640..447b96f951 100644
--- a/includes/libs/rdbms/lbfactory/LBFactoryMulti.php
+++ b/includes/libs/rdbms/lbfactory/LBFactoryMulti.php
@@ -21,6 +21,11 @@
  * @ingroup Database
  */
 
+namespace Wikimedia\Rdbms;
+
+use IDatabase;
+use InvalidArgumentException;
+
 /**
  * A multi-database, multi-master factory for Wikimedia and similar installations.
  * Ignores the old configuration globals.
@@ -260,7 +265,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 +353,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;