From: Brion Vibber <brion@users.mediawiki.org>
Date: Tue, 29 Jan 2008 00:23:28 +0000 (+0000)
Subject: Tweak to nextJobDB: don't explode on a system where $wgAlternateMaster array isn... 
X-Git-Tag: 1.31.0-rc.0~49738
X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=5549172ef0d212703d82dda87355852f1f22730c;p=lhc%2Fweb%2Fwiklou.git

Tweak to nextJobDB: don't explode on a system where $wgAlternateMaster array isn't set up; just use $wgDBserver.
---

diff --git a/maintenance/nextJobDB.php b/maintenance/nextJobDB.php
index acb277d276..b2500caf78 100644
--- a/maintenance/nextJobDB.php
+++ b/maintenance/nextJobDB.php
@@ -21,7 +21,9 @@ if ( !$pendingDBs ) {
 	$pendingDBs = array();
 	# Cross-reference DBs by master DB server
 	$dbsByMaster = array();
-	$defaultMaster = $wgAlternateMaster['DEFAULT'];
+	$defaultMaster = isset( $wgAlternateMaster['DEFAULT'] )
+		? $wgAlternateMaster['DEFAULT']
+		: $wgDBserver;
 	foreach ( $wgLocalDatabases as $db ) {
 		if ( isset( $wgAlternateMaster[$db] ) ) {
 			$dbsByMaster[$wgAlternateMaster[$db]][] = $db;