Avoid pointless use of isset() in LBFactoryMulti()
authorAaron Schulz <aschulz@wikimedia.org>
Thu, 22 Dec 2016 03:10:04 +0000 (19:10 -0800)
committerAaron Schulz <aschulz@wikimedia.org>
Thu, 22 Dec 2016 03:10:04 +0000 (19:10 -0800)
Change-Id: Ibaaa97a515f627860f6681f204aa1542b1639640

includes/libs/rdbms/lbfactory/LBFactoryMulti.php

index 1d22873..4158e61 100644 (file)
@@ -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;