From: Aaron Schulz <aschulz@wikimedia.org>
Date: Sun, 21 Apr 2019 19:57:05 +0000 (-0700)
Subject: externalstore: make ExternalStoreDB::getDomainId treat false the same as null
X-Git-Tag: 1.34.0-rc.0~1636^2
X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=bbf7fee3ac08952075d85f714340dfde8c1d7b8e;p=lhc%2Fweb%2Fwiklou.git

externalstore: make ExternalStoreDB::getDomainId treat false the same as null

Callers like SqlBlobStore sometimes pass in false for the current wiki

Bug: T200471
Change-Id: I3025c869df07de312471d00a0ab7107c1fa14a90
---

diff --git a/includes/externalstore/ExternalStoreDB.php b/includes/externalstore/ExternalStoreDB.php
index 75f7ccdfab..4164505822 100644
--- a/includes/externalstore/ExternalStoreDB.php
+++ b/includes/externalstore/ExternalStoreDB.php
@@ -166,7 +166,7 @@ class ExternalStoreDB extends ExternalStoreMedium {
 	 * @return string|bool Database domain ID or false
 	 */
 	private function getDomainId( array $server ) {
-		if ( isset( $this->params['wiki'] ) ) {
+		if ( isset( $this->params['wiki'] ) && $this->params['wiki'] !== false ) {
 			return $this->params['wiki']; // explicit domain
 		}