From 3b7500e3141fbdef2668b5863e8530f20387bfbb Mon Sep 17 00:00:00 2001
From: Chad Horohoe <demon@users.mediawiki.org>
Date: Sun, 9 Aug 2009 12:55:56 +0000
Subject: [PATCH] Make $site and $lang global, just to be safe. Call
 finalSetup() in loadWikimediaSettings()

---
 maintenance/Maintenance.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index 22be3f3318..51ecfab240 100644
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -572,7 +572,7 @@ abstract class Maintenance {
 	 * Do setup specific to WMF
 	 */
 	public function loadWikimediaSettings() {
-		global $IP, $wgNoDBParam, $wgUseNormalUser, $wgConf;
+		global $IP, $wgNoDBParam, $wgUseNormalUser, $wgConf, $site, $lang;
 
 		if ( empty( $wgNoDBParam ) ) {
 			# Check if we were passed a db name
@@ -616,6 +616,8 @@ abstract class Maintenance {
 		if ( $lang == 'test' && $site == 'wikipedia' ) {
 			define( 'TESTWIKI', 1 );
 		}
+
+		$this->finalSetup();
 	}
 
 	/**
-- 
2.20.1