From: Aaron Schulz <aschulz@wikimedia.org>
Date: Thu, 6 Nov 2014 19:38:22 +0000 (-0800)
Subject: Allow the empty string as the wiki DB
X-Git-Tag: 1.31.0-rc.0~13358
X-Git-Url: https://git.cyclocoop.org//%22?a=commitdiff_plain;h=f4f5f41194ec3e417755579b392a4c09faf3db53;p=lhc%2Fweb%2Fwiklou.git

Allow the empty string as the wiki DB

* This is useful when cluster= is set but the DB is not there yet

Change-Id: I1766c564448502c7359c7da964f0becd2e3222c6
---

diff --git a/maintenance/sql.php b/maintenance/sql.php
index afa3ef725c..886e3f108d 100644
--- a/maintenance/sql.php
+++ b/maintenance/sql.php
@@ -39,7 +39,8 @@ class MwSql extends Maintenance {
 	}
 
 	public function execute() {
-		$wiki = $this->getOption( 'wikidb' ) ?: false;
+		// We wan't to allow "" for the wikidb, meaning don't call select_db()
+		$wiki = $this->hasOption( 'wikidb' ) ? $this->getOption( 'wikidb' ) : false;
 		// Get the appropriate load balancer (for this wiki)
 		if ( $this->hasOption( 'cluster' ) ) {
 			$lb = wfGetLBFactory()->getExternalLB( $this->getOption( 'cluster' ), $wiki );