Make $site and $lang global, just to be safe. Call finalSetup() in loadWikimediaSetti...

diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index 22be3f3..51ecfab 100644 (file)
--- 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();
        }
 
        /**